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

annotate libinterp/corefcn/gl-render.cc @ 17651:b0f529c3671d

gl-render.cc: Replace custom min function with std::min. * libinterp/corefcn/gl-render.cc(xmin): Delete custom function and replace calling occurrences with std::min. Use standard indent of 2 spaces for constructors.

author	Rik <rik@octave.org>
date	Mon, 14 Oct 2013 10:44:38 -0700
parents	c0ce72efe5a8
children	d449f4668b72

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
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 13985 diff changeset	3 Copyright (C) 2008-2012 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
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	23 #ifdef HAVE_CONFIG_H
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	24 #include <config.h>
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
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	27 #if defined (HAVE_OPENGL)
3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	28
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	29 #include <iostream>
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	30
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	31 #include <lo-mappers.h>
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8263 diff changeset	32 #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	33 #include "oct-refcount.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	34 #include "gl-render.h"
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	35 #include "txt-eng.h"
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	36 #include "txt-eng-ft.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	37
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	38 #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	39
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	40 // Win32 API requires the CALLBACK attributes for
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	41 // GLU callback functions. Define it to empty on
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	42 // other platforms.
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	43 #ifndef CALLBACK
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	44 #define CALLBACK
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	45 #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	46
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	47 class
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	48 opengl_texture
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	49 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	50 protected:
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	51 class texture_rep
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	52 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	53 public:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	54 texture_rep (void)
11584 cda4aa780d58 Another round of initialising members in the constructor initialisation list Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11576 diff changeset	55 : id (), w (), h (), tw (), th (), tx (), ty (),
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	56 valid (false), count (1)
11584 cda4aa780d58 Another round of initialising members in the constructor initialisation list Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11576 diff changeset	57 { }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	58
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	59 texture_rep (GLuint id_arg, int w_arg, int h_arg, int tw_arg, int th_arg)
17651 b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	60 : id (id_arg), w (w_arg), h (h_arg), tw (tw_arg), th (th_arg),
b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	61 tx (double(w)/tw), ty (double(h)/th), valid (true),
b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	62 count (1) { }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	63
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	64 ~texture_rep (void)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	65 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	66 if (valid)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	67 glDeleteTextures (1, &id);
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	68 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	69
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	70 void bind (int mode) const
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	71 { if (valid) glBindTexture (mode, id); }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	72
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	73 void tex_coord (double q, double r) const
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	74 { if (valid) glTexCoord2d (qtx, rty); }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	75
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	76 GLuint id;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	77 int w, h;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	78 int tw, th;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	79 double tx, ty;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	80 bool valid;
12125 a21a3875ca83 implement a common class for reference counts Jaroslav Hajek <highegg@gmail.com> parents: 12122 diff changeset	81 octave_refcount<int> count;
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	82 };
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	83
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	84 texture_rep *rep;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	85
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	86 private:
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	87 opengl_texture (texture_rep *_rep) : rep (_rep) { }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	88
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	89 public:
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	90 opengl_texture (void) : rep (new texture_rep ()) { }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	91
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	92 opengl_texture (const opengl_texture& tx)
17651 b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	93 : rep (tx.rep)
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	94 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	95 rep->count++;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	96 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	97
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	98 ~opengl_texture (void)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	99 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	100 if (--rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	101 delete rep;
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	102 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	103
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	104 opengl_texture& operator = (const opengl_texture& tx)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	105 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	106 if (--rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	107 delete rep;
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	108
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	109 rep = tx.rep;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	110 rep->count++;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	111
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	112 return *this;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	113 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	114
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	115 static opengl_texture create (const octave_value& data);
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	116
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	117 void bind (int mode = GL_TEXTURE_2D) const
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	118 { rep->bind (mode); }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	119
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	120 void tex_coord (double q, double r) const
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	121 { rep->tex_coord (q, r); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	122
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	123 bool is_valid (void) const
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	124 { return rep->valid; }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	125 };
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	126
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	127 static int
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	128 next_power_of_2 (int n)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	129 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	130 int m = 1;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	131
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	132 while (m < n && m < std::numeric_limits<int>::max ())
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	133 m <<= 1;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	134
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	135 return m;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	136 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	137
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	138 opengl_texture
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	139 opengl_texture::create (const octave_value& data)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	140 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	141 opengl_texture retval;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	142
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	143 dim_vector dv (data.dims ());
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	144
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	145 // Expect RGB data
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	146 if (dv.length () == 3 && dv(2) == 3)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	147 {
17651 b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	148 // FIXME: dim_vectors hold octave_idx_type values.
b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	149 // Should we check for dimensions larger than intmax?
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	150 int h = dv(0), w = dv(1), tw, th;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	151 GLuint id;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	152 bool ok = true;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	153
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	154 tw = next_power_of_2 (w);
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	155 th = next_power_of_2 (w);
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	156
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	157 glGenTextures (1, &id);
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	158 glBindTexture (GL_TEXTURE_2D, id);
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	159
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	160 if (data.is_double_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	161 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	162 const NDArray xdata = data.array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	163
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	164 OCTAVE_LOCAL_BUFFER (float, a, (3twth));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	165
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	166 for (int i = 0; i < h; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	167 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	168 for (int j = 0, idx = itw3; j < w; j++, idx += 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	169 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	170 a[idx] = xdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	171 a[idx+1] = xdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	172 a[idx+2] = xdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	173 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	174 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	175
17651 b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	176 glTexImage2D (GL_TEXTURE_2D, 0, 3, tw, th, 0, GL_RGB, GL_FLOAT, a);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	177 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	178 else if (data.is_uint8_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	179 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	180 const uint8NDArray xdata = data.uint8_array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	181
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	182 OCTAVE_LOCAL_BUFFER (octave_uint8, a, (3twth));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	183
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	184 for (int i = 0; i < h; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	185 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	186 for (int j = 0, idx = itw3; j < w; j++, idx += 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	187 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	188 a[idx] = xdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	189 a[idx+1] = xdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	190 a[idx+2] = xdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	191 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	192 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	193
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	194 glTexImage2D (GL_TEXTURE_2D, 0, 3, tw, th, 0,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	195 GL_RGB, GL_UNSIGNED_BYTE, a);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	196 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	197 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	198 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	199 ok = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	200 warning ("opengl_texture::create: invalid texture data type (expected double or uint8)");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	201 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	202
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	203 if (ok)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	204 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	205 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	206 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	207
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	208 if (glGetError () != GL_NO_ERROR)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	209 warning ("opengl_texture::create: OpenGL error while generating texture data");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	210 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	211 retval = opengl_texture (new texture_rep (id, w, h, tw, th));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	212 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	213 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	214 else
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	215 warning ("opengl_texture::create: invalid texture data size");
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	216
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	217 return retval;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	218 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	219
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	220 class
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	221 opengl_tesselator
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	222 {
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	223 public:
8724 a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	224 #if defined (HAVE_FRAMEWORK_OPENGL) && defined (HAVE_GLUTESSCALLBACK_THREEDOTS)
a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	225 typedef GLvoid (CALLBACK *fcn) (...);
a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	226 #else
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	227 typedef void (CALLBACK *fcn) (void);
8724 a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	228 #endif
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	229
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	230 public:
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	231
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14838 diff changeset	232 opengl_tesselator (void) : glu_tess (0), fill () { init (); }
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	233
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	234 virtual ~opengl_tesselator (void)
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	235 { if (glu_tess) gluDeleteTess (glu_tess); }
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	236
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	237 void begin_polygon (bool filled = true)
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	238 {
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	239 gluTessProperty (glu_tess, GLU_TESS_BOUNDARY_ONLY,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	240 (filled ? GL_FALSE : GL_TRUE));
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	241 fill = filled;
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	242 gluTessBeginPolygon (glu_tess, this);
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	243 }
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	244
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	245 void end_polygon (void) const
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	246 { gluTessEndPolygon (glu_tess); }
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	247
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	248 void begin_contour (void) const
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	249 { gluTessBeginContour (glu_tess); }
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	250
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	251 void end_contour (void) const
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	252 { gluTessEndContour (glu_tess); }
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	253
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	254 void add_vertex (double loc, void data) const
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	255 { gluTessVertex (glu_tess, loc, data); }
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	256
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	257 protected:
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	258 virtual void begin (GLenum /type/) { }
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	259
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	260 virtual void end (void) { }
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	261
17651 b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	262 virtual void vertex (void * /data/) { }
b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	263
b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	264 virtual void combine (GLdouble [3] /c/, void * [4] /data/,
b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	265 GLfloat [4] /w/, void ** /out_data/) { }
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	266
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	267 virtual void edge_flag (GLboolean /flag/) { }
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	268
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	269 virtual void error (GLenum err)
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	270 { ::error ("OpenGL tesselation error (%d)", err); }
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	271
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	272 virtual void init (void)
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	273 {
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	274 glu_tess = gluNewTess ();
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	275
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	276 gluTessCallback (glu_tess, GLU_TESS_BEGIN_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	277 reinterpret_cast<fcn> (tess_begin));
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	278 gluTessCallback (glu_tess, GLU_TESS_END_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	279 reinterpret_cast<fcn> (tess_end));
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	280 gluTessCallback (glu_tess, GLU_TESS_VERTEX_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	281 reinterpret_cast<fcn> (tess_vertex));
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	282 gluTessCallback (glu_tess, GLU_TESS_COMBINE_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	283 reinterpret_cast<fcn> (tess_combine));
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	284 gluTessCallback (glu_tess, GLU_TESS_EDGE_FLAG_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	285 reinterpret_cast<fcn> (tess_edge_flag));
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	286 gluTessCallback (glu_tess, GLU_TESS_ERROR_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	287 reinterpret_cast<fcn> (tess_error));
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	288 }
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	289
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	290 bool is_filled (void) const { return fill; }
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	291
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	292 private:
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	293 static void CALLBACK tess_begin (GLenum type, void *t)
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	294 { reinterpret_cast<opengl_tesselator *> (t)->begin (type); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	295
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	296 static void CALLBACK tess_end (void *t)
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	297 { reinterpret_cast<opengl_tesselator *> (t)->end (); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	298
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	299 static void CALLBACK tess_vertex (void v, void t)
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	300 { reinterpret_cast<opengl_tesselator *> (t)->vertex (v); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	301
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	302 static void CALLBACK tess_combine (GLdouble c[3], void *v[4], GLfloat w[4],
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	303 void *out, void t)
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	304 { reinterpret_cast<opengl_tesselator *> (t)->combine (c, v, w, out); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	305
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	306 static void CALLBACK tess_edge_flag (GLboolean flag, void *t)
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	307 { reinterpret_cast<opengl_tesselator *> (t)->edge_flag (flag); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	308
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	309 static void CALLBACK tess_error (GLenum err, void *t)
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	310 { reinterpret_cast<opengl_tesselator *> (t)->error (err); }
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	311
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	312 private:
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	313
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	314 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	315
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	316 opengl_tesselator (const opengl_tesselator&);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	317
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	318 opengl_tesselator operator = (const opengl_tesselator&);
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	319
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	320 GLUtesselator *glu_tess;
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	321 bool fill;
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	322 };
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	323
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	324 class
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	325 vertex_data
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	326 {
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	327 public:
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	328 class vertex_data_rep
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	329 {
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	330 public:
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	331 Matrix coords;
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	332 Matrix color;
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	333 Matrix normal;
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	334 double alpha;
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	335 float ambient;
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	336 float diffuse;
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	337 float specular;
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	338 float specular_exp;
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	339
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	340 // reference counter
12125 a21a3875ca83 implement a common class for reference counts Jaroslav Hajek <highegg@gmail.com> parents: 12122 diff changeset	341 octave_refcount<int> count;
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	342
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	343 vertex_data_rep (void)
11584 cda4aa780d58 Another round of initialising members in the constructor initialisation list Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11576 diff changeset	344 : coords (), color (), normal (), alpha (),
cda4aa780d58 Another round of initialising members in the constructor initialisation list Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11576 diff changeset	345 ambient (), diffuse (), specular (), specular_exp (),count (1) { }
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	346
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	347 vertex_data_rep (const Matrix& c, const Matrix& col, const Matrix& n,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	348 double a, float as, float ds, float ss, float se)
17651 b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	349 : coords (c), color (col), normal (n), alpha (a),
b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	350 ambient (as), diffuse (ds), specular (ss), specular_exp (se),
b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	351 count (1) { }
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	352 };
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	353
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	354 private:
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	355 vertex_data_rep *rep;
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	356
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	357 vertex_data_rep *nil_rep (void) const
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	358 {
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	359 static vertex_data_rep *nr = new vertex_data_rep ();
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	360
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	361 return nr;
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	362 }
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	363
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	364 public:
7904 1fddd9b8e862 Fix nil_rep reference counting in gl-render.cc::vertex_data internal class John W. Eaton <jwe@octave.org> parents: 7874 diff changeset	365 vertex_data (void) : rep (nil_rep ())
1fddd9b8e862 Fix nil_rep reference counting in gl-render.cc::vertex_data internal class John W. Eaton <jwe@octave.org> parents: 7874 diff changeset	366 { rep->count++; }
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	367
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	368 vertex_data (const vertex_data& v) : rep (v.rep)
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	369 { rep->count++; }
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	370
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	371 vertex_data (const Matrix& c, const Matrix& col, const Matrix& n,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	372 double a, float as, float ds, float ss, float se)
17651 b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	373 : rep (new vertex_data_rep (c, col, n, a, as, ds, ss, se))
7904 1fddd9b8e862 Fix nil_rep reference counting in gl-render.cc::vertex_data internal class John W. Eaton <jwe@octave.org> parents: 7874 diff changeset	374 { }
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	375
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	376 vertex_data (vertex_data_rep *new_rep)
17651 b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	377 : rep (new_rep) { }
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	378
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	379 ~vertex_data (void)
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	380 {
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	381 if (--rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	382 delete rep;
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	383 }
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	384
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	385 vertex_data& operator = (const vertex_data& v)
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	386 {
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	387 if (--rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	388 delete rep;
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	389
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	390 rep = v.rep;
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	391 rep->count++;
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	392
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	393 return *this;
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	394 }
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	395
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	396 vertex_data_rep *get_rep (void) const { return rep; }
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	397 };
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	398
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	399 class
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	400 opengl_renderer::patch_tesselator : public opengl_tesselator
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	401 {
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	402 public:
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	403 patch_tesselator (opengl_renderer *r, int cmode, int lmode, int idx = 0)
17651 b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	404 : opengl_tesselator (), renderer (r),
b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	405 color_mode (cmode), light_mode (lmode), index (idx),
b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	406 first (true), tmp_vdata ()
12164 18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12126 diff changeset	407 { }
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	408
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	409 protected:
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	410 void begin (GLenum type)
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	411 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	412 //printf ("patch_tesselator::begin (%d)\n", type);
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	413 first = true;
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	414
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	415 if (color_mode == 2 \|\| light_mode == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	416 glShadeModel (GL_SMOOTH);
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	417 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	418 glShadeModel (GL_FLAT);
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	419
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	420 if (is_filled ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	421 renderer->set_polygon_offset (true, 1+index);
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	422
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	423 glBegin (type);
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	424 }
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	425
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	426 void end (void)
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	427 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	428 //printf ("patch_tesselator::end\n");
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	429 glEnd ();
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	430 renderer->set_polygon_offset (false);
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	431 }
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	432
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	433 void vertex (void *data)
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	434 {
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	435 vertex_data::vertex_data_rep *v
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	436 = reinterpret_cast<vertex_data::vertex_data_rep *> (data);
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	437 //printf ("patch_tesselator::vertex (%g, %g, %g)\n", v->coords(0), v->coords(1), v->coords(2));
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	438
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	439 // FIXME: why did I need to keep the first vertex of the face
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	440 // in JHandles? I think it's related to the fact that the
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	441 // tessellation process might re-order the vertices, such that
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	442 // the first one you get here might not be the first one of the face;
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	443 // but I can't figure out the actual reason.
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	444 if (color_mode > 0 && (first \|\| color_mode == 2))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	445 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	446 Matrix col = v->color;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	447
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	448 if (col.numel () == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	449 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	450 glColor3dv (col.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	451 if (light_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	452 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	453 float buf[4] = { 0, 0, 0, 1 };
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	454
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	455 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	456 buf[k] = (v->ambient * col(k));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	457 glMaterialfv (LIGHT_MODE, GL_AMBIENT, buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	458
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	459 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	460 buf[k] = (v->diffuse * col(k));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	461 glMaterialfv (LIGHT_MODE, GL_AMBIENT, buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	462 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	463 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	464 }
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	465
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	466 if (light_mode > 0 && (first \|\| light_mode == 2))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	467 glNormal3dv (v->normal.data ());
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	468
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	469 glVertex3dv (v->coords.data ());
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	470
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	471 first = false;
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	472 }
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	473
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	474 void combine (GLdouble xyz[3], void *data[4], GLfloat w[4],
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	475 void **out_data)
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	476 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	477 //printf ("patch_tesselator::combine\n");
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	478
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	479 vertex_data::vertex_data_rep *v[4];
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	480 int vmax = 4;
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	481
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	482 for (int i = 0; i < 4; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	483 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	484 v[i] = reinterpret_cast<vertex_data::vertex_data_rep *> (data[i]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	485
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	486 if (vmax == 4 && ! v[i])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	487 vmax = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	488 }
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	489
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	490 Matrix vv (1, 3, 0.0);
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	491 Matrix cc;
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	492 Matrix nn (1, 3, 0.0);
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	493 double aa = 0.0;
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	494
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	495 vv(0) = xyz[0];
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	496 vv(1) = xyz[1];
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	497 vv(2) = xyz[2];
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	498
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	499 if (v[0]->color.numel ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	500 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	501 cc.resize (1, 3, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	502 for (int ic = 0; ic < 3; ic++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	503 for (int iv = 0; iv < vmax; iv++)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	504 cc(ic) += (w[iv] * v[iv]->color (ic));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	505 }
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	506
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	507 if (v[0]->normal.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	508 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	509 for (int in = 0; in < 3; in++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	510 for (int iv = 0; iv < vmax; iv++)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	511 nn(in) += (w[iv] * v[iv]->normal (in));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	512 }
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	513
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	514 for (int iv = 0; iv < vmax; iv++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	515 aa += (w[iv] * v[iv]->alpha);
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	516
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	517 vertex_data new_v (vv, cc, nn, aa, v[0]->ambient, v[0]->diffuse,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	518 v[0]->specular, v[0]->specular_exp);
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	519 tmp_vdata.push_back (new_v);
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	520
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	521 *out_data = new_v.get_rep ();
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	522 }
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	523
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	524 private:
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	525
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	526 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	527
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	528 patch_tesselator (const patch_tesselator&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	529
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	530 patch_tesselator& operator = (const patch_tesselator&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	531
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	532 opengl_renderer *renderer;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	533 int color_mode; // 0: uni, 1: flat, 2: interp
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	534 int light_mode; // 0: none, 1: flat, 2: gouraud
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	535 int index;
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	536 bool first;
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	537 std::list<vertex_data> tmp_vdata;
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	538 };
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	539
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	540 void
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	541 opengl_renderer::draw (const graphics_object& go, bool toplevel)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	542 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	543 if (! go.valid_object ())
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	544 return;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	545
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	546 const base_properties& props = go.get_properties ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	547
14838 1abb7c083171 Make sure opengl_renderer::toolkit is defined. Michael Goffioul <michael.goffioul@gmail.com> parents: 14138 diff changeset	548 if (! toolkit)
1abb7c083171 Make sure opengl_renderer::toolkit is defined. Michael Goffioul <michael.goffioul@gmail.com> parents: 14138 diff changeset	549 toolkit = props.get_toolkit ();
1abb7c083171 Make sure opengl_renderer::toolkit is defined. Michael Goffioul <michael.goffioul@gmail.com> parents: 14138 diff changeset	550
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	551 if (go.isa ("figure"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	552 draw_figure (dynamic_cast<const figure::properties&> (props));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	553 else if (go.isa ("axes"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	554 draw_axes (dynamic_cast<const axes::properties&> (props));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	555 else if (go.isa ("line"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	556 draw_line (dynamic_cast<const line::properties&> (props));
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	557 else if (go.isa ("surface"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	558 draw_surface (dynamic_cast<const surface::properties&> (props));
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	559 else if (go.isa ("patch"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	560 draw_patch (dynamic_cast<const patch::properties&> (props));
7866 35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	561 else if (go.isa ("hggroup"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	562 draw_hggroup (dynamic_cast<const hggroup::properties&> (props));
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	563 else if (go.isa ("text"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	564 draw_text (dynamic_cast<const text::properties&> (props));
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	565 else if (go.isa ("image"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	566 draw_image (dynamic_cast<const image::properties&> (props));
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13281 diff changeset	567 else if (go.isa ("uimenu") \|\| go.isa ("uicontrol")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13281 diff changeset	568 \|\| go.isa ("uicontextmenu") \|\| go.isa ("uitoolbar")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13281 diff changeset	569 \|\| go.isa ("uipushtool") \|\| go.isa ("uitoggletool"))
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	570 /* SKIP */;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	571 else if (go.isa ("uipanel"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	572 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	573 if (toplevel)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	574 draw_uipanel (dynamic_cast<const uipanel::properties&> (props), go);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	575 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	576 else
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	577 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	578 warning ("opengl_renderer: cannot render object of type '%s'",
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	579 props.graphics_object_name ().c_str ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	580 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	581 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	582
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	583 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	584 opengl_renderer::draw_figure (const figure::properties& props)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	585 {
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	586 // Initialize OpenGL context
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	587
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	588 init_gl_context (props.is___enhanced__ (), props.get_color_rgb ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	589
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	590 // Draw children
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	591
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	592 draw (props.get_all_children (), false);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	593 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	594
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	595 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	596 opengl_renderer::draw_uipanel (const uipanel::properties& props,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	597 const graphics_object& go)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	598 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	599 graphics_object fig = go.get_ancestor ("figure");
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	600 const figure::properties& figProps =
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	601 dynamic_cast<const figure::properties&> (fig.get_properties ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	602
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	603 // Initialize OpenGL context
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	604
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	605 init_gl_context (figProps.is___enhanced__ (),
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	606 props.get_backgroundcolor_rgb ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	607
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	608 // Draw children
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	609
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	610 draw (props.get_all_children (), false);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	611 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	612
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	613 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	614 opengl_renderer::init_gl_context (bool enhanced, const Matrix& c)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	615 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	616 // Initialize OpenGL context
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	617
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	618 glEnable (GL_DEPTH_TEST);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	619 glDepthFunc (GL_LEQUAL);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	620 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	621 glAlphaFunc (GL_GREATER, 0.0f);
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	622 glEnable (GL_NORMALIZE);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	623
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	624 if (enhanced)
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	625 {
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	626 glEnable (GL_BLEND);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	627 glEnable (GL_LINE_SMOOTH);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	628 }
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	629 else
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	630 {
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	631 glDisable (GL_BLEND);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	632 glDisable (GL_LINE_SMOOTH);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	633 }
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	634
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	635 // Clear background
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	636
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14838 diff changeset	637 if (c.length () >= 3)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	638 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	639 glClearColor (c(0), c(1), c(2), 1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	640 glClear (GL_COLOR_BUFFER_BIT \| GL_DEPTH_BUFFER_BIT);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	641 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	642 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	643
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	644 void
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	645 opengl_renderer::render_grid (const std::string& gridstyle,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	646 const Matrix& ticks, double lim1, double lim2,
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	647 double p1, double p1N, double p2, double p2N,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	648 int xyz, bool is_3D)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	649 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	650 set_linestyle (gridstyle, true);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	651 glBegin (GL_LINES);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	652 for (int i = 0; i < ticks.numel (); i++)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	653 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	654 double val = ticks(i);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	655 if (lim1 <= val && val <= lim2)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	656 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	657 if (xyz == 0) // X
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	658 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	659 glVertex3d (val, p1N, p2);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	660 glVertex3d (val, p1, p2);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	661 if (is_3D)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	662 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	663 glVertex3d (val, p1, p2N);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	664 glVertex3d (val, p1, p2);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	665 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	666 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	667 else if (xyz == 1) // Y
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	668 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	669 glVertex3d (p1N, val, p2);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	670 glVertex3d (p1, val, p2);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	671 if (is_3D)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	672 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	673 glVertex3d (p1, val, p2N);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	674 glVertex3d (p1, val, p2);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	675 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	676 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	677 else if (xyz == 2) // Z
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	678 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	679 glVertex3d (p1N, p2, val);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	680 glVertex3d (p1, p2, val);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	681 glVertex3d (p1, p2N, val);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	682 glVertex3d (p1, p2, val);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	683 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	684 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	685 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	686 glEnd ();
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	687 set_linestyle ("-", true);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	688 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	689
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	690 void
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	691 opengl_renderer::render_tickmarks (const Matrix& ticks,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	692 double lim1, double lim2,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	693 double p1, double p1N,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	694 double p2, double p2N,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	695 double dx, double dy, double dz,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	696 int xyz, bool mirror)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	697 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	698 glBegin (GL_LINES);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	699
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	700 for (int i = 0; i < ticks.numel (); i++)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	701 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	702 double val = ticks(i);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	703
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	704 if (lim1 <= val && val <= lim2)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	705 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	706 if (xyz == 0) // X
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	707 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	708 glVertex3d (val, p1, p2);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	709 glVertex3d (val, p1+dy, p2+dz);
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	710 if (mirror)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	711 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	712 glVertex3d (val, p1N, p2N);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	713 glVertex3d (val, p1N-dy, p2N-dz);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	714 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	715 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	716 else if (xyz == 1) // Y
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	717 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	718 glVertex3d (p1, val, p2);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	719 glVertex3d (p1+dx, val, p2+dz);
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	720 if (mirror)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	721 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	722 glVertex3d (p1N, val, p2N);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	723 glVertex3d (p1N-dx, val, p2N-dz);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	724 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	725 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	726 else if (xyz == 2) // Z
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	727 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	728 glVertex3d (p1, p2, val);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	729 glVertex3d (p1+dx, p2+dy, val);
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	730 if (mirror)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	731 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	732 glVertex3d (p1N, p2N, val);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	733 glVertex3d (p1N-dx, p2N-dy, val);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	734 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	735 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	736 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	737 }
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	738
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	739 glEnd ();
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	740 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	741
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	742 void
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	743 opengl_renderer::render_ticktexts (const Matrix& ticks,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	744 const string_vector& ticklabels,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	745 double lim1, double lim2,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	746 double p1, double p2,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	747 int xyz, int ha, int va,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	748 int& wmax, int& hmax)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	749 {
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	750 int nticks = ticks.numel ();
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	751 int nlabels = ticklabels.numel ();
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	752
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	753 if (nlabels == 0)
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	754 return;
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	755
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	756 for (int i = 0; i < nticks; i++)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	757 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	758 double val = ticks(i);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	759
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	760 if (lim1 <= val && val <= lim2)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	761 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	762 Matrix b;
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	763
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	764 std::string label (ticklabels(i % nlabels));
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	765 label.erase (0, label.find_first_not_of (" "));
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	766 label = label.substr (0, label.find_last_not_of (" ")+1);
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	767
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	768 // FIXME: as tick text is transparent, shouldn't it be
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	769 // drawn after axes object, for correct rendering?
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	770 if (xyz == 0) // X
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	771 {
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	772 b = render_text (label, val, p1, p2, ha, va);
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	773 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	774 else if (xyz == 1) // Y
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	775 {
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	776 b = render_text (label, p1, val, p2, ha, va);
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	777 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	778 else if (xyz == 2) // Z
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	779 {
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	780 b = render_text (label, p1, p2, val, ha, va);
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	781 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	782
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	783 wmax = std::max (wmax, static_cast<int> (b(2)));
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	784 hmax = std::max (hmax, static_cast<int> (b(3)));
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	785 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	786 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	787 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	788
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	789 void
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	790 opengl_renderer::setup_opengl_transformation (const axes::properties& props)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	791 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	792 // setup OpenGL transformation
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	793
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	794 Matrix x_zlim = props.get_transform_zlim ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	795
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	796 xZ1 = x_zlim(0)-(x_zlim(1)-x_zlim(0))/2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	797 xZ2 = x_zlim(1)+(x_zlim(1)-x_zlim(0))/2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	798
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	799 Matrix x_mat1 = props.get_opengl_matrix_1 ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	800 Matrix x_mat2 = props.get_opengl_matrix_2 ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	801
8724 a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	802 #if defined (HAVE_FRAMEWORK_OPENGL)
a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	803 GLint vw[4];
a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	804 #else
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	805 int vw[4];
8724 a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	806 #endif
a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	807
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	808 glGetIntegerv (GL_VIEWPORT, vw);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	809
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	810 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	811 glLoadIdentity ();
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	812 glScaled (1, 1, -1);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	813 glMultMatrixd (x_mat1.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	814 glMatrixMode (GL_PROJECTION);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	815 glLoadIdentity ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	816 glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	817 glMultMatrixd (x_mat2.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	818 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	819
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	820 glClear (GL_DEPTH_BUFFER_BIT);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	821
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	822 glDisable (GL_LINE_SMOOTH);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	823
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	824 // store axes transformation data
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	825
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	826 xform = props.get_transform ();
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	827 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	828
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	829 void
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	830 opengl_renderer::draw_axes_planes (const axes::properties& props)
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	831 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	832 double xPlane = props.get_xPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	833 double yPlane = props.get_yPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	834 double zPlane = props.get_zPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	835 double xPlaneN = props.get_xPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	836 double yPlaneN = props.get_yPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	837 double zPlaneN = props.get_zPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	838
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	839 // Axes planes
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	840 Matrix axe_color = props.get_color_rgb ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	841 if (axe_color.numel () > 0 && props.is_visible ())
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	842 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	843 set_color (axe_color);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	844 set_polygon_offset (true, 2.5);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	845
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	846 glBegin (GL_QUADS);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	847
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	848 // X plane
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	849 glVertex3d (xPlane, yPlaneN, zPlaneN);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	850 glVertex3d (xPlane, yPlane, zPlaneN);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	851 glVertex3d (xPlane, yPlane, zPlane);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	852 glVertex3d (xPlane, yPlaneN, zPlane);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	853
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	854 // Y plane
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	855 glVertex3d (xPlaneN, yPlane, zPlaneN);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	856 glVertex3d (xPlane, yPlane, zPlaneN);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	857 glVertex3d (xPlane, yPlane, zPlane);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	858 glVertex3d (xPlaneN, yPlane, zPlane);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	859
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	860 // Z plane
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	861 glVertex3d (xPlaneN, yPlaneN, zPlane);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	862 glVertex3d (xPlane, yPlaneN, zPlane);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	863 glVertex3d (xPlane, yPlane, zPlane);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	864 glVertex3d (xPlaneN, yPlane, zPlane);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	865
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	866 glEnd ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	867
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	868 set_polygon_offset (false);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	869 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	870 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	871
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	872 void
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	873 opengl_renderer::draw_axes_boxes (const axes::properties& props)
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	874 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	875 bool xySym = props.get_xySym ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	876 double xPlane = props.get_xPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	877 double yPlane = props.get_yPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	878 double zPlane = props.get_zPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	879 double xPlaneN = props.get_xPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	880 double yPlaneN = props.get_yPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	881 double zPlaneN = props.get_zPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	882 double xpTick = props.get_xpTick ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	883 double ypTick = props.get_ypTick ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	884 double zpTick = props.get_zpTick ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	885 double xpTickN = props.get_xpTickN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	886 double ypTickN = props.get_ypTickN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	887 double zpTickN = props.get_zpTickN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	888
13216 434e227b100b Improvements to plotyy. Ben Abbott <bpabbott@mac.com> parents: 13141 diff changeset	889 bool plotyy = (props.has_property ("__plotyy_axes__"));
12443 24b38afd6a45 fix plotyy bugs #31800, #32211 Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	890
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	891 // Axes box
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	892
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	893 set_linestyle ("-", true);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	894 set_linewidth (props.get_linewidth ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	895
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	896 if (props.is_visible ())
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	897 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	898 glBegin (GL_LINES);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	899
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	900 // X box
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	901 set_color (props.get_xcolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	902 glVertex3d (xPlaneN, ypTick, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	903 glVertex3d (xPlane, ypTick, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	904
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	905 if (props.is_box ())
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	906 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	907 glVertex3d (xPlaneN, ypTickN, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	908 glVertex3d (xPlane, ypTickN, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	909 glVertex3d (xPlaneN, ypTickN, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	910 glVertex3d (xPlane, ypTickN, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	911 glVertex3d (xPlaneN, ypTick, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	912 glVertex3d (xPlane, ypTick, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	913 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	914
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	915 // Y box
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	916 set_color (props.get_ycolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	917 glVertex3d (xpTick, yPlaneN, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	918 glVertex3d (xpTick, yPlane, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	919
12443 24b38afd6a45 fix plotyy bugs #31800, #32211 Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	920 if (props.is_box () && ! plotyy)
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	921 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	922 glVertex3d (xpTickN, yPlaneN, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	923 glVertex3d (xpTickN, yPlane, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	924 glVertex3d (xpTickN, yPlaneN, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	925 glVertex3d (xpTickN, yPlane, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	926 glVertex3d (xpTick, yPlaneN, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	927 glVertex3d (xpTick, yPlane, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	928 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	929
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	930 // Z box
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	931 set_color (props.get_zcolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	932
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	933 if (xySym)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	934 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	935 glVertex3d (xPlaneN, yPlane, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	936 glVertex3d (xPlaneN, yPlane, zPlane);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	937 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	938 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	939 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	940 glVertex3d (xPlane, yPlaneN, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	941 glVertex3d (xPlane, yPlaneN, zPlane);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	942 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	943
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	944 if (props.is_box ())
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	945 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	946 glVertex3d (xPlane, yPlane, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	947 glVertex3d (xPlane, yPlane, zPlane);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	948
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	949 if (xySym)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	950 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	951 glVertex3d (xPlane, yPlaneN, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	952 glVertex3d (xPlane, yPlaneN, zPlane);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	953 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	954 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	955 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	956 glVertex3d (xPlaneN, yPlane, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	957 glVertex3d (xPlaneN, yPlane, zPlane);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	958 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	959
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	960 glVertex3d (xPlaneN, yPlaneN, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	961 glVertex3d (xPlaneN, yPlaneN, zPlane);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	962 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	963
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	964 glEnd ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	965 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	966 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	967
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	968 void
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	969 opengl_renderer::draw_axes_x_grid (const axes::properties& props)
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	970 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	971 int xstate = props.get_xstate ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	972 int zstate = props.get_zstate ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	973 bool x2Dtop = props.get_x2Dtop ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	974 bool layer2Dtop = props.get_layer2Dtop ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	975 bool xyzSym = props.get_xyzSym ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	976 bool nearhoriz = props.get_nearhoriz ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	977 double xticklen = props.get_xticklen ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	978 double xtickoffset = props.get_xtickoffset ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	979 double fy = props.get_fy ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	980 double fz = props.get_fz ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	981 double x_min = props.get_x_min ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	982 double x_max = props.get_x_max ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	983 double yPlane = props.get_yPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	984 double yPlaneN = props.get_yPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	985 double ypTick = props.get_ypTick ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	986 double ypTickN = props.get_ypTickN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	987 double zPlane = props.get_zPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	988 double zPlaneN = props.get_zPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	989 double zpTick = props.get_zpTick ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	990 double zpTickN = props.get_zpTickN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	991
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	992 // X grid
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	993
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	994 if (props.is_visible () && xstate != AXE_DEPTH_DIR)
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	995 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	996 std::string gridstyle = props.get_gridlinestyle ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	997 std::string minorgridstyle = props.get_minorgridlinestyle ();
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	998 bool do_xgrid = (props.is_xgrid () && (gridstyle != "none"));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	999 bool do_xminorgrid = (props.is_xminorgrid () && (minorgridstyle != "none"));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1000 bool do_xminortick = props.is_xminortick ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1001 Matrix xticks = xform.xscale (props.get_xtick ().matrix_value ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1002 Matrix xmticks = xform.xscale (props.get_xmtick ().matrix_value ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1003 string_vector xticklabels = props.get_xticklabel ().all_strings ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1004 int wmax = 0, hmax = 0;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1005 bool tick_along_z = nearhoriz \|\| xisinf (fy);
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1006 bool mirror = props.is_box () && xstate != AXE_ANY_DIR;
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1007
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1008 set_color (props.get_xcolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1009
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1010 // grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1011 if (do_xgrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1012 render_grid (gridstyle, xticks, x_min, x_max,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1013 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1014 zPlaneN, 0, (zstate != AXE_DEPTH_DIR));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1015
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1016 // tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1017 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1018 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1019 render_tickmarks (xticks, x_min, x_max, ypTick, ypTick,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1020 zpTick, zpTickN, 0., 0.,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1021 signum (zpTick-zpTickN)fzxticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1022 0, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1023 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1024 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1025 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1026 render_tickmarks (xticks, x_min, x_max, ypTick, ypTickN,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1027 zpTick, zpTick, 0.,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1028 signum (ypTick-ypTickN)fyxticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1029 0., 0, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1030 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1031
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1032 // tick texts
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1033 if (xticklabels.numel () > 0)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1034 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1035 int halign = (xstate == AXE_HORZ_DIR ? 1 : (xyzSym ? 0 : 2));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1036 int valign = (xstate == AXE_VERT_DIR ? 1 : (x2Dtop ? 0 : 2));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1037
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1038 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1039 render_ticktexts (xticks, xticklabels, x_min, x_max, ypTick,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1040 zpTick+signum (zpTick-zpTickN)fzxtickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1041 0, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1042 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1043 render_ticktexts (xticks, xticklabels, x_min, x_max,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1044 ypTick+signum (ypTick-ypTickN)fyxtickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1045 zpTick, 0, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1046 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1047
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1048 // minor grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1049 if (do_xminorgrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1050 render_grid (minorgridstyle, xmticks, x_min, x_max,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1051 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1052 zPlaneN, 0, (zstate != AXE_DEPTH_DIR));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1053
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1054 // minor tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1055 if (do_xminortick)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1056 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1057 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1058 render_tickmarks (xmticks, x_min, x_max, ypTick, ypTick,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1059 zpTick, zpTickN, 0., 0.,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1060 signum (zpTick-zpTickN)fzxticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1061 0, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1062 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1063 render_tickmarks (xmticks, x_min, x_max, ypTick, ypTickN,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1064 zpTick, zpTick, 0.,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1065 signum (ypTick-ypTickN)fyxticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1066 0., 0, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1067 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1068
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1069 gh_manager::get_object (props.get_xlabel ()).set ("visible", "on");
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1070 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1071 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1072 gh_manager::get_object (props.get_xlabel ()).set ("visible", "off");
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1073 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1074
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1075 void
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1076 opengl_renderer::draw_axes_y_grid (const axes::properties& props)
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1077 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1078 int ystate = props.get_ystate ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1079 int zstate = props.get_zstate ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1080 bool y2Dright = props.get_y2Dright ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1081 bool layer2Dtop = props.get_layer2Dtop ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1082 bool xyzSym = props.get_xyzSym ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1083 bool nearhoriz = props.get_nearhoriz ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1084 double yticklen = props.get_yticklen ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1085 double ytickoffset = props.get_ytickoffset ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1086 double fx = props.get_fx ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1087 double fz = props.get_fz ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1088 double xPlane = props.get_xPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1089 double xPlaneN = props.get_xPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1090 double xpTick = props.get_xpTick ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1091 double xpTickN = props.get_xpTickN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1092 double y_min = props.get_y_min ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1093 double y_max = props.get_y_max ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1094 double zPlane = props.get_zPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1095 double zPlaneN = props.get_zPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1096 double zpTick = props.get_zpTick ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1097 double zpTickN = props.get_zpTickN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1098
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1099 // Y grid
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1100
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1101 if (ystate != AXE_DEPTH_DIR && props.is_visible ())
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1102 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1103 std::string gridstyle = props.get_gridlinestyle ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1104 std::string minorgridstyle = props.get_minorgridlinestyle ();
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1105 bool do_ygrid = (props.is_ygrid () && (gridstyle != "none"));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1106 bool do_yminorgrid = (props.is_yminorgrid () && (minorgridstyle != "none"));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1107 bool do_yminortick = props.is_yminortick ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1108 Matrix yticks = xform.yscale (props.get_ytick ().matrix_value ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1109 Matrix ymticks = xform.yscale (props.get_ymtick ().matrix_value ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1110 string_vector yticklabels = props.get_yticklabel ().all_strings ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1111 int wmax = 0, hmax = 0;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1112 bool tick_along_z = nearhoriz \|\| xisinf (fx);
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1113 bool mirror = props.is_box () && ystate != AXE_ANY_DIR
13216 434e227b100b Improvements to plotyy. Ben Abbott <bpabbott@mac.com> parents: 13141 diff changeset	1114 && (! props.has_property ("__plotyy_axes__"));
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1115
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1116 set_color (props.get_ycolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1117
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1118 // grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1119 if (do_ygrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1120 render_grid (gridstyle, yticks, y_min, y_max,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1121 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1122 zPlaneN, 1, (zstate != AXE_DEPTH_DIR));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1123
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1124 // tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1125 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1126 render_tickmarks (yticks, y_min, y_max, xpTick, xpTick,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1127 zpTick, zpTickN, 0., 0.,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1128 signum (zpTick-zpTickN)fzyticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1129 1, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1130 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1131 render_tickmarks (yticks, y_min, y_max, xpTick, xpTickN,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1132 zpTick, zpTick,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1133 signum (xPlaneN-xPlane)fxyticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1134 0., 0., 1, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1135
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1136 // tick texts
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1137 if (yticklabels.numel () > 0)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1138 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1139 int halign = (ystate == AXE_HORZ_DIR
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1140 ? 1 : (!xyzSym \|\| y2Dright ? 0 : 2));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1141 int valign = (ystate == AXE_VERT_DIR ? 1 : 2);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1142
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1143 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1144 render_ticktexts (yticks, yticklabels, y_min, y_max, xpTick,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1145 zpTick+signum (zpTick-zpTickN)fzytickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1146 1, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1147 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1148 render_ticktexts (yticks, yticklabels, y_min, y_max,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1149 xpTick+signum (xpTick-xpTickN)fxytickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1150 zpTick, 1, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1151 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1152
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1153 // minor grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1154 if (do_yminorgrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1155 render_grid (minorgridstyle, ymticks, y_min, y_max,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1156 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1157 zPlaneN, 1, (zstate != AXE_DEPTH_DIR));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1158
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1159 // minor tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1160 if (do_yminortick)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1161 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1162 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1163 render_tickmarks (ymticks, y_min, y_max, xpTick, xpTick,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1164 zpTick, zpTickN, 0., 0.,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1165 signum (zpTick-zpTickN)fzyticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1166 1, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1167 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1168 render_tickmarks (ymticks, y_min, y_max, xpTick, xpTickN,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1169 zpTick, zpTick,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1170 signum (xpTick-xpTickN)fxyticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1171 0., 0., 1, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1172 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1173
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1174 gh_manager::get_object (props.get_ylabel ()).set ("visible", "on");
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1175 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1176 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1177 gh_manager::get_object (props.get_ylabel ()).set ("visible", "off");
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1178 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1179
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1180 void
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1181 opengl_renderer::draw_axes_z_grid (const axes::properties& props)
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1182 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1183 int zstate = props.get_zstate ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1184 bool xySym = props.get_xySym ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1185 bool zSign = props.get_zSign ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1186 double zticklen = props.get_zticklen ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1187 double ztickoffset = props.get_ztickoffset ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1188 double fx = props.get_fx ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1189 double fy = props.get_fy ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1190 double xPlane = props.get_xPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1191 double xPlaneN = props.get_xPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1192 double yPlane = props.get_yPlane ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1193 double yPlaneN = props.get_yPlaneN ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1194 double z_min = props.get_z_min ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1195 double z_max = props.get_z_max ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1196
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1197 // Z Grid
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1198
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1199 if (zstate != AXE_DEPTH_DIR && props.is_visible ())
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1200 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1201 std::string gridstyle = props.get_gridlinestyle ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1202 std::string minorgridstyle = props.get_minorgridlinestyle ();
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1203 bool do_zgrid = (props.is_zgrid () && (gridstyle != "none"));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1204 bool do_zminorgrid = (props.is_zminorgrid () && (minorgridstyle != "none"));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1205 bool do_zminortick = props.is_zminortick ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1206 Matrix zticks = xform.zscale (props.get_ztick ().matrix_value ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1207 Matrix zmticks = xform.zscale (props.get_zmtick ().matrix_value ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1208 string_vector zticklabels = props.get_zticklabel ().all_strings ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1209 int wmax = 0, hmax = 0;
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1210 bool mirror = props.is_box () && zstate != AXE_ANY_DIR;
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1211
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1212 set_color (props.get_zcolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1213
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1214 // grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1215 if (do_zgrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1216 render_grid (gridstyle, zticks, z_min, z_max,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1217 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1218
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1219 // tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1220 if (xySym)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1221 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1222 if (xisinf (fy))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1223 render_tickmarks (zticks, z_min, z_max, xPlaneN, xPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1224 yPlane, yPlane,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1225 signum (xPlaneN-xPlane)fxzticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1226 0., 0., 2, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1227 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1228 render_tickmarks (zticks, z_min, z_max, xPlaneN, xPlaneN,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1229 yPlane, yPlane, 0.,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1230 signum (yPlane-yPlaneN)fyzticklen,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1231 0., 2, false);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1232 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1233 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1234 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1235 if (xisinf (fx))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1236 render_tickmarks (zticks, z_min, z_max, xPlaneN, xPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1237 yPlaneN, yPlane, 0.,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1238 signum (yPlaneN-yPlane)fyzticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1239 0., 2, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1240 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1241 render_tickmarks (zticks, z_min, z_max, xPlane, xPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1242 yPlaneN, yPlane,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1243 signum (xPlane-xPlaneN)fxzticklen,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1244 0., 0., 2, false);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1245 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1246
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1247 // FIXME: tick texts
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1248 if (zticklabels.numel () > 0)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1249 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1250 int halign = 2;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1251 int valign = (zstate == AXE_VERT_DIR ? 1 : (zSign ? 3 : 2));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1252
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1253 if (xySym)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1254 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1255 if (xisinf (fy))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1256 render_ticktexts (zticks, zticklabels, z_min, z_max,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1257 xPlaneN+signum (xPlaneN-xPlane)fxztickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1258 yPlane, 2, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1259 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1260 render_ticktexts (zticks, zticklabels, z_min, z_max, xPlaneN,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1261 yPlane+signum (yPlane-yPlaneN)fyztickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1262 2, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1263 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1264 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1265 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1266 if (xisinf (fx))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1267 render_ticktexts (zticks, zticklabels, z_min, z_max, xPlane,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1268 yPlaneN+signum (yPlaneN-yPlane)fyztickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1269 2, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1270 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1271 render_ticktexts (zticks, zticklabels, z_min, z_max,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1272 xPlane+signum (xPlane-xPlaneN)fxztickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1273 yPlaneN, 2, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1274 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1275 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1276
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1277 // minor grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1278 if (do_zminorgrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1279 render_grid (minorgridstyle, zmticks, z_min, z_max,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1280 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1281
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1282 // minor tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1283 if (do_zminortick)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1284 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1285 if (xySym)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1286 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1287 if (xisinf (fy))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1288 render_tickmarks (zmticks, z_min, z_max, xPlaneN, xPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1289 yPlane, yPlane,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1290 signum (xPlaneN-xPlane)fxzticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1291 0., 0., 2, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1292 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1293 render_tickmarks (zmticks, z_min, z_max, xPlaneN, xPlaneN,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1294 yPlane, yPlane, 0.,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1295 signum (yPlane-yPlaneN)fyzticklen/2,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1296 0., 2, false);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1297 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1298 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1299 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1300 if (xisinf (fx))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1301 render_tickmarks (zmticks, z_min, z_max, xPlane, xPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1302 yPlaneN, yPlane, 0.,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1303 signum (yPlaneN-yPlane)fyzticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1304 0., 2, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1305 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1306 render_tickmarks (zmticks, z_min, z_max, xPlane, xPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1307 yPlaneN, yPlaneN,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1308 signum (xPlane-xPlaneN)fxzticklen/2,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1309 0., 0., 2, false);
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 12965 diff changeset	1310 }
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1311 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1312
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1313 gh_manager::get_object (props.get_zlabel ()).set ("visible", "on");
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1314 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1315 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1316 gh_manager::get_object (props.get_zlabel ()).set ("visible", "off");
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1317 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1318
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1319 void
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1320 opengl_renderer::draw_axes_children (const axes::properties& props)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1321 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1322 // Children
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1323
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1324 GLboolean antialias;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1325 glGetBooleanv (GL_LINE_SMOOTH, &antialias);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1326
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1327 if (antialias == GL_TRUE)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1328 glEnable (GL_LINE_SMOOTH);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1329
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1330 Matrix children = props.get_all_children ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1331 std::list<graphics_object> obj_list;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1332 std::list<graphics_object>::iterator it;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1333
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1334 // 1st pass: draw light objects
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1335
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1336 // Start with the last element of the array of child objects to
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1337 // display them in the oder they were added to the array.
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1338
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1339 for (octave_idx_type i = children.numel () - 1; i >= 0; i--)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1340 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1341 graphics_object go = gh_manager::get_object (children (i));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1342
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1343 if (go.get_properties ().is_visible ())
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1344 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1345 if (go.isa ("light"))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1346 draw (go);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1347 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1348 obj_list.push_back (go);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1349 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1350 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1351
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1352 // 2nd pass: draw other objects (with units set to "data")
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1353
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1354 it = obj_list.begin ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1355 while (it != obj_list.end ())
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1356 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1357 graphics_object go = (*it);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1358
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1359 // FIXME: check whether object has "units" property and it is set
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1360 // to "data"
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1361 if (! go.isa ("text") \|\| go.get ("units").string_value () == "data")
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1362 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1363 set_clipping (go.get_properties ().is_clipping ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1364 draw (go);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1365
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1366 it = obj_list.erase (it);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1367 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1368 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1369 it++;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1370 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1371
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1372 // 3rd pass: draw remaining objects
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1373
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1374 glDisable (GL_DEPTH_TEST);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1375
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1376 for (it = obj_list.begin (); it != obj_list.end (); it++)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1377 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1378 graphics_object go = (*it);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1379
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1380 set_clipping (go.get_properties ().is_clipping ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1381 draw (go);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1382 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1383
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1384 glEnable (GL_DEPTH_TEST);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1385
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1386 set_clipping (false);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1387
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1388 // FIXME: finalize rendering (transparency processing)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1389 // FIXME: draw zoom box, if needed
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1390 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1391
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1392 void
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1393 opengl_renderer::draw_axes (const axes::properties& props)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1394 {
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1395 double x_min = props.get_x_min ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1396 double x_max = props.get_x_max ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1397 double y_min = props.get_y_min ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1398 double y_max = props.get_y_max ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1399 double z_min = props.get_z_min ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1400 double z_max = props.get_z_max ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1401
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1402 setup_opengl_transformation (props);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1403
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1404 // draw axes object
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1405
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1406 draw_axes_planes (props);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1407 draw_axes_boxes (props);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1408
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1409 set_font (props);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1410
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1411 draw_axes_x_grid (props);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1412 draw_axes_y_grid (props);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1413 draw_axes_z_grid (props);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1414
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1415 set_linestyle ("-");
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1416
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1417 set_clipbox (x_min, x_max, y_min, y_max, z_min, z_max);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1418
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1419 draw_axes_children (props);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1420 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1421
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1422 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	1423 opengl_renderer::draw_line (const line::properties& props)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1424 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1425 Matrix x = xform.xscale (props.get_xdata ().matrix_value ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1426 Matrix y = xform.yscale (props.get_ydata ().matrix_value ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1427 Matrix z = xform.zscale (props.get_zdata ().matrix_value ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1428
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1429 bool has_z = (z.numel () > 0);
17651 b0f529c3671d gl-render.cc: Replace custom min function with std::min. Rik <rik@octave.org> parents: 17602 diff changeset	1430 int n = static_cast<int> (std::min (std::min (x.numel (), y.numel ()), (has_z ? z.numel () : std::numeric_limits<int>::max ())));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1431 octave_uint8 clip_mask = (props.is_clipping () ? 0x7F : 0x40), clip_ok (0x40);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1432
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1433 std::vector<octave_uint8> clip (n);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1434
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1435 if (has_z)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1436 for (int i = 0; i < n; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1437 clip[i] = (clip_code (x(i), y(i), z(i)) & clip_mask);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1438 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1439 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1440 double z_mid = (zmin+zmax)/2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1441
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1442 for (int i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1443 clip[i] = (clip_code (x(i), y(i), z_mid) & clip_mask);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1444 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1445
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1446 if (! props.linestyle_is ("none"))
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1447 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1448 set_color (props.get_color_rgb ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1449 set_linestyle (props.get_linestyle (), false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1450 set_linewidth (props.get_linewidth ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1451
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1452 if (has_z)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1453 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1454 bool flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1455
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1456 for (int i = 1; i < n; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1457 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1458 if ((clip[i-1] & clip[i]) == clip_ok)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1459 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1460 if (! flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1461 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1462 flag = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1463 glBegin (GL_LINE_STRIP);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1464 glVertex3d (x(i-1), y(i-1), z(i-1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1465 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1466 glVertex3d (x(i), y(i), z(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1467 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1468 else if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1469 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1470 flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1471 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1472 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1473 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1474
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1475 if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1476 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1477 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1478 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1479 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1480 bool flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1481
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1482 for (int i = 1; i < n; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1483 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1484 if ((clip[i-1] & clip[i]) == clip_ok)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1485 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1486 if (! flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1487 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1488 flag = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1489 glBegin (GL_LINE_STRIP);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1490 glVertex2d (x(i-1), y(i-1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1491 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1492 glVertex2d (x(i), y(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1493 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1494 else if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1495 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1496 flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1497 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1498 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1499 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1500
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1501 if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1502 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1503 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1504
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1505 set_linewidth (0.5);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1506 set_linestyle ("-");
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1507 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1508
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1509 set_clipping (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1510
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1511 if (! props.marker_is ("none") &&
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1512 ! (props.markeredgecolor_is ("none")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1513 && props.markerfacecolor_is ("none")))
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1514 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1515 Matrix lc, fc;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1516
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1517 if (props.markeredgecolor_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1518 lc = props.get_color_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1519 else if (! props.markeredgecolor_is ("none"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1520 lc = props.get_markeredgecolor_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1521
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1522 if (props.markerfacecolor_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1523 fc = props.get_color_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1524 else if (! props.markerfacecolor_is ("none"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1525 fc = props.get_markerfacecolor_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1526
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1527 init_marker (props.get_marker (), props.get_markersize (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1528 props.get_linewidth ());
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1529
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1530 for (int i = 0; i < n; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1531 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1532 if (clip[i] == clip_ok)
11266 be710ed252ff gl-render.cc (opengl_renderer::draw_line): layer markers in 2D plots Daisuke TAKAGO <takago@neptune.kanazawa-it.ac.jp> parents: 11209 diff changeset	1533 draw_marker (x(i), y(i),
be710ed252ff gl-render.cc (opengl_renderer::draw_line): layer markers in 2D plots Daisuke TAKAGO <takago@neptune.kanazawa-it.ac.jp> parents: 11209 diff changeset	1534 has_z ? z(i) : static_cast<double> (i) / n,
be710ed252ff gl-render.cc (opengl_renderer::draw_line): layer markers in 2D plots Daisuke TAKAGO <takago@neptune.kanazawa-it.ac.jp> parents: 11209 diff changeset	1535 lc, fc);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1536 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1537
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1538 end_marker ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1539 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1540
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1541 set_clipping (props.is_clipping ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1542 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1543
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1544 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	1545 opengl_renderer::draw_surface (const surface::properties& props)
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1546 {
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	1547 const Matrix x = xform.xscale (props.get_xdata ().matrix_value ());
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	1548 const Matrix y = xform.yscale (props.get_ydata ().matrix_value ());
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	1549 const Matrix z = xform.zscale (props.get_zdata ().matrix_value ());
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1550
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1551 int zr = z.rows (), zc = z.columns ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1552
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1553 NDArray c;
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	1554 const NDArray n = props.get_vertexnormals ().array_value ();
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1555
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1556 // FIXME: handle transparency
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1557 Matrix a;
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1558
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1559 if (props.facelighting_is ("phong") \|\| props.edgelighting_is ("phong"))
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1560 warning ("opengl_renderer::draw: phong light model not supported");
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1561
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1562 int fc_mode = (props.facecolor_is_rgb () ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1563 (props.facecolor_is ("flat") ? 1 :
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1564 (props.facecolor_is ("interp") ? 2 :
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1565 (props.facecolor_is ("texturemap") ? 3 : -1))));
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1566 int fl_mode = (props.facelighting_is ("none") ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1567 (props.facelighting_is ("flat") ? 1 : 2));
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	1568 int fa_mode = (props.facealpha_is_double () ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1569 (props.facealpha_is ("flat") ? 1 : 2));
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1570 int ec_mode = (props.edgecolor_is_rgb () ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1571 (props.edgecolor_is ("flat") ? 1 :
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1572 (props.edgecolor_is ("interp") ? 2 : -1)));
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1573 int el_mode = (props.edgelighting_is ("none") ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1574 (props.edgelighting_is ("flat") ? 1 : 2));
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	1575 int ea_mode = (props.edgealpha_is_double () ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1576 (props.edgealpha_is ("flat") ? 1 : 2));
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1577
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1578 Matrix fcolor = (fc_mode == 3 ? Matrix (1, 3, 1.0) : props.get_facecolor_rgb ());
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1579 Matrix ecolor = props.get_edgecolor_rgb ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1580
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1581 float as = props.get_ambientstrength ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1582 float ds = props.get_diffusestrength ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1583 float ss = props.get_specularstrength ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1584 float se = props.get_specularexponent ();
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1585 float cb[4] = { 0.0, 0.0, 0.0, 1.0 };
0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1586 double d = 1.0;
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1587
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1588 opengl_texture tex;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1589
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1590 int i1, i2, j1, j2;
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1591 bool x_mat = (x.rows () == z.rows ());
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1592 bool y_mat = (y.columns () == z.columns ());
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1593
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1594 i1 = i2 = j1 = j2 = 0;
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1595
17558 e48a22b94727 Don't plot NaN values in cdata (bug #40114). Rik <rik@octave.org> parents: 17269 diff changeset	1596 if ((fc_mode > 0 && fc_mode < 3) \|\| ec_mode > 0)
e48a22b94727 Don't plot NaN values in cdata (bug #40114). Rik <rik@octave.org> parents: 17269 diff changeset	1597 c = props.get_color_data ().array_value ();
e48a22b94727 Don't plot NaN values in cdata (bug #40114). Rik <rik@octave.org> parents: 17269 diff changeset	1598
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1599 boolMatrix clip (z.dims (), false);
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1600
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1601 for (int i = 0; i < zr; i++)
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1602 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1603 if (x_mat)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1604 i1 = i;
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1605
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1606 for (int j = 0; j < zc; j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1607 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1608 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1609 j1 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1610
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1611 clip(i,j) = is_nan_or_inf (x(i1,j), y(i,j1), z(i,j));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1612 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1613 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1614
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1615 if (fa_mode > 0 \|\| ea_mode > 0)
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1616 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1617 // FIXME: implement alphadata conversion
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1618 //a = props.get_alpha_data ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1619 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1620
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1621 if (fl_mode > 0 \|\| el_mode > 0)
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1622 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1623 float buf[4] = { ss, ss, ss, 1 };
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1624
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1625 glMaterialfv (LIGHT_MODE, GL_SPECULAR, buf);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1626 glMaterialf (LIGHT_MODE, GL_SHININESS, se);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1627 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1628
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1629 // FIXME: good candidate for caching, transfering pixel
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1630 // data to OpenGL is time consuming.
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1631 if (fc_mode == 3)
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1632 tex = opengl_texture::create (props.get_color_data ());
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1633
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1634 if (! props.facecolor_is ("none"))
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1635 {
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	1636 if (props.get_facealpha_double () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1637 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1638 if (fc_mode == 0 \|\| fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1639 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1640 glColor3dv (fcolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1641 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1642 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1643 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1644 cb[i] = as * fcolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1645 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1646
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1647 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1648 cb[i] = ds * fcolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1649 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1650 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1651 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1652
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1653 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1654 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1655 glShadeModel ((fc_mode == 2 \|\| fl_mode == 2) ? GL_SMOOTH : GL_FLAT);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1656 set_polygon_offset (true, 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1657 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1658 glEnable (GL_TEXTURE_2D);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1659
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1660 for (int i = 1; i < zc; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1661 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1662 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1663 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1664 i1 = i-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1665 i2 = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1666 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1667
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1668 for (int j = 1; j < zr; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1669 {
17589 c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1670
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1671 if (clip(j-1, i-1) \|\| clip(j, i-1)
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1672 \|\| clip(j-1, i) \|\| clip(j, i))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1673 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1674
17589 c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1675 if (fc_mode == 1)
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1676 {
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1677 // "flat" only needs color at lower-left vertex
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1678 if (! xfinite (c(j-1,i-1)))
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1679 continue;
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1680 }
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1681 else if (fc_mode == 2)
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1682 {
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1683 // "interp" needs valid color at all 4 vertices
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1684 if (! (xfinite (c(j-1, i-1)) && xfinite (c(j, i-1))
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1685 && xfinite (c(j-1, i)) && xfinite (c(j, i))))
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1686 continue;
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1687 }
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1688
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1689 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1690 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1691 j1 = j-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1692 j2 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1693 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1694
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1695 glBegin (GL_QUADS);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1696
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1697 // Vertex 1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1698 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1699 tex.tex_coord (double (i-1) / (zc-1), double (j-1) / (zr-1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1700 else if (fc_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1701 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1702 // FIXME: is there a smarter way to do this?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1703 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1704 cb[k] = c(j-1, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1705 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1706
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1707 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1708 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1709 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1710 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1711 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1712
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1713 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1714 cb[k] = ds * c(j-1, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1715 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1716 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1717 }
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1718 if (fl_mode > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1719 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1720 d = sqrt (n(j-1,i-1,0) * n(j-1,i-1,0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1721 + n(j-1,i-1,1) * n(j-1,i-1,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1722 + n(j-1,i-1,2) * n(j-1,i-1,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1723 glNormal3d (n(j-1,i-1,0)/d, n(j-1,i-1,1)/d, n(j-1,i-1,2)/d);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1724 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1725 glVertex3d (x(j1,i-1), y(j-1,i1), z(j-1,i-1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1726
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1727 // Vertex 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1728 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1729 tex.tex_coord (double (i) / (zc-1), double (j-1) / (zr-1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1730 else if (fc_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1731 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1732 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1733 cb[k] = c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1734 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1735
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1736 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1737 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1738 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1739 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1740 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1741
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1742 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1743 cb[k] = ds * c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1744 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1745 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1746 }
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1747
0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1748 if (fl_mode == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1749 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1750 d = sqrt (n(j-1,i,0) * n(j-1,i,0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1751 + n(j-1,i,1) * n(j-1,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1752 + n(j-1,i,2) * n(j-1,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1753 glNormal3d (n(j-1,i,0)/d, n(j-1,i,1)/d, n(j-1,i,2)/d);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1754 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1755
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1756 glVertex3d (x(j1,i), y(j-1,i2), z(j-1,i));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1757
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1758 // Vertex 3
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1759 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1760 tex.tex_coord (double (i) / (zc-1), double (j) / (zr-1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1761 else if (fc_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1762 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1763 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1764 cb[k] = c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1765 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1766
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1767 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1768 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1769 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1770 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1771 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1772
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1773 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1774 cb[k] = ds * c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1775 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1776 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1777 }
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1778 if (fl_mode == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1779 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1780 d = sqrt (n(j,i,0) * n(j,i,0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1781 + n(j,i,1) * n(j,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1782 + n(j,i,2) * n(j,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1783 glNormal3d (n(j,i,0)/d, n(j,i,1)/d, n(j,i,2)/d);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1784 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1785 glVertex3d (x(j2,i), y(j,i2), z(j,i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1786
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1787 // Vertex 4
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1788 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1789 tex.tex_coord (double (i-1) / (zc-1), double (j) / (zr-1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1790 else if (fc_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1791 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1792 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1793 cb[k] = c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1794 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1795
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1796 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1797 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1798 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1799 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1800 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1801
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1802 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1803 cb[k] = ds * c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1804 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1805 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1806 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1807 if (fl_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1808 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1809 d = sqrt (n(j,i-1,0) * n(j,i-1,0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1810 + n(j,i-1,1) * n(j,i-1,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1811 + n(j,i-1,2) * n(j,i-1,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1812 glNormal3d (n(j,i-1,0)/d, n(j,i-1,1)/d, n(j,i-1,2)/d);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1813 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1814 glVertex3d (x(j2,i-1), y(j,i1), z(j,i-1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1815
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1816 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1817 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1818 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1819
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1820 set_polygon_offset (false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1821 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1822 glDisable (GL_TEXTURE_2D);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1823
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1824 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1825 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1826 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1827 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1828 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1829 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1830 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1831 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1832
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1833 if (! props.edgecolor_is ("none"))
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1834 {
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	1835 if (props.get_edgealpha_double () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1836 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1837 if (ec_mode == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1838 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1839 glColor3dv (ecolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1840 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1841 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1842 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1843 cb[i] = as * ecolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1844 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1845
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1846 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1847 cb[i] = ds * ecolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1848 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1849 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1850 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1851
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1852 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1853 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1854 glShadeModel ((ec_mode == 2 \|\| el_mode == 2) ? GL_SMOOTH : GL_FLAT);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1855
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1856 set_linestyle (props.get_linestyle (), false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1857 set_linewidth (props.get_linewidth ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1858
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1859 // Mesh along Y-axis
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1860
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1861 if (props.meshstyle_is ("both") \|\| props.meshstyle_is ("column"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1862 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1863 for (int i = 0; i < zc; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1864 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1865 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1866 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1867 i1 = i-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1868 i2 = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1869 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1870
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1871 for (int j = 1; j < zr; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1872 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1873 if (clip(j-1,i) \|\| clip(j,i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1874 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1875
17589 c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1876 if (ec_mode == 1)
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1877 {
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1878 // "flat" only needs color at lower-left vertex
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1879 if (! xfinite (c(j-1,i)))
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1880 continue;
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1881 }
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1882 else if (ec_mode == 2)
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1883 {
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1884 // "interp" needs valid color at both vertices
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1885 if (! (xfinite (c(j-1, i)) && xfinite (c(j, i))))
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1886 continue;
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1887 }
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1888
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1889 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1890 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1891 j1 = j-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1892 j2 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1893 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1894
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1895 glBegin (GL_LINES);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1896
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1897 // Vertex 1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1898 if (ec_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1899 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1900 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1901 cb[k] = c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1902 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1903
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1904 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1905 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1906 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1907 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1908 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1909
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1910 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1911 cb[k] = ds * c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1912 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1913 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1914 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1915 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1916 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1917 d = sqrt (n(j-1,i,0) * n(j-1,i,0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1918 + n(j-1,i,1) * n(j-1,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1919 + n(j-1,i,2) * n(j-1,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1920 glNormal3d (n(j-1,i,0)/d, n(j-1,i,1)/d, n(j-1,i,2)/d);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1921 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1922 glVertex3d (x(j1,i), y(j-1,i2), z(j-1,i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1923
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1924 // Vertex 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1925 if (ec_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1926 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1927 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1928 cb[k] = c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1929 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1930
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1931 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1932 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1933 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1934 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1935 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1936
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1937 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1938 cb[k] = ds * c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1939 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1940 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1941 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1942 if (el_mode == 2)
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1943 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1944 d = sqrt (n(j,i,0) * n(j,i,0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1945 + n(j,i,1) * n(j,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1946 + n(j,i,2) * n(j,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1947 glNormal3d (n(j,i,0)/d, n(j,i,1)/d, n(j,i,2)/d);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1948 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1949 glVertex3d (x(j2,i), y(j,i2), z(j,i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1950
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1951 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1952 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1953 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1954 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1955
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1956 // Mesh along X-axis
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1957
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1958 if (props.meshstyle_is ("both") \|\| props.meshstyle_is ("row"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1959 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1960 for (int j = 0; j < zr; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1961 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1962 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1963 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1964 j1 = j-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1965 j2 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1966 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1967
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1968 for (int i = 1; i < zc; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1969 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1970 if (clip(j,i-1) \|\| clip(j,i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1971 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1972
17589 c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1973 if (ec_mode == 1)
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1974 {
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1975 // "flat" only needs color at lower-left vertex
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1976 if (! xfinite (c(j,i-1)))
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1977 continue;
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1978 }
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1979 else if (ec_mode == 2)
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1980 {
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1981 // "interp" needs valid color at both vertices
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1982 if (! (xfinite (c(j, i-1)) && xfinite (c(j, i))))
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1983 continue;
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1984 }
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	1985
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1986 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1987 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1988 i1 = i-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1989 i2 = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1990 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1991
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1992 glBegin (GL_LINES);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1993
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1994 // Vertex 1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1995 if (ec_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1996 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1997 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1998 cb[k] = c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1999 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2000
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2001 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2002 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2003 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2004 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2005 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2006
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2007 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2008 cb[k] = ds * c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2009 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2010 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2011 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2012 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2013 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2014 d = sqrt (n(j,i-1,0) * n(j,i-1,0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2015 + n(j,i-1,1) * n(j,i-1,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2016 + n(j,i-1,2) * n(j,i-1,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2017 glNormal3d (n(j,i-1,0)/d, n(j,i-1,1)/d, n(j,i-1,2)/d);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2018 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2019 glVertex3d (x(j2,i-1), y(j,i1), z(j,i-1));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2020
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2021 // Vertex 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2022 if (ec_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2023 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2024 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2025 cb[k] = c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2026 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2027
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2028 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2029 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2030 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2031 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2032 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2033
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2034 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2035 cb[k] = ds * c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2036 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2037 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2038 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2039 if (el_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2040 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2041 d = sqrt (n(j,i,0) * n(j,i,0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2042 + n(j,i,1) * n(j,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2043 + n(j,i,2) * n(j,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2044 glNormal3d (n(j,i,0)/d, n(j,i,1)/d, n(j,i,2)/d);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2045 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2046 glVertex3d (x(j2,i), y(j,i2), z(j,i));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2047
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2048 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2049 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2050 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2051 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2052
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2053 set_linestyle ("-");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2054 set_linewidth (0.5);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2055
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2056 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2057 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2058 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2059 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2060 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2061 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2062 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2063 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2064
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2065 if (! props.marker_is ("none") &&
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2066 ! (props.markeredgecolor_is ("none")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2067 && props.markerfacecolor_is ("none")))
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2068 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2069 // FIXME: check how transparency should be handled in markers
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2070 // FIXME: check what to do with marker facecolor set to auto
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2071 // and facecolor set to none.
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2072
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2073 bool do_edge = ! props.markeredgecolor_is ("none");
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2074 bool do_face = ! props.markerfacecolor_is ("none");
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2075
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2076 Matrix mecolor = props.get_markeredgecolor_rgb ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2077 Matrix mfcolor = props.get_markerfacecolor_rgb ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2078 Matrix cc (1, 3, 0.0);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2079
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2080 if (mecolor.numel () == 0 && props.markeredgecolor_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2081 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2082 mecolor = props.get_edgecolor_rgb ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2083 do_edge = ! props.edgecolor_is ("none");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2084 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2085
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2086 if (mfcolor.numel () == 0 && props.markerfacecolor_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2087 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2088 mfcolor = props.get_facecolor_rgb ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2089 do_face = ! props.facecolor_is ("none");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2090 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2091
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2092 if ((mecolor.numel () == 0 \|\| mfcolor.numel () == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2093 && c.numel () == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2094 c = props.get_color_data ().array_value ();
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2095
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2096 init_marker (props.get_marker (), props.get_markersize (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2097 props.get_linewidth ());
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2098
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2099 for (int i = 0; i < zc; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2100 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2101 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2102 i1 = i;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2103
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2104 for (int j = 0; j < zr; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2105 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2106 if (clip(j,i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2107 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2108
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2109 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2110 j1 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2111
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2112 if ((do_edge && mecolor.numel () == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2113 \|\| (do_face && mfcolor.numel () == 0))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2114 {
17589 c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	2115 if (! xfinite (c(j,i)))
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	2116 continue; // Skip NaNs in color data
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	2117
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2118 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2119 cc(k) = c(j,i,k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2120 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2121
17589 c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	2122 Matrix lc = (do_edge ? (mecolor.numel () == 0 ? cc : mecolor)
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	2123 : Matrix ());
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	2124 Matrix fc = (do_face ? (mfcolor.numel () == 0 ? cc : mfcolor)
c3aadd228c37 Fix surf/mesh handling of NaN values in cdata (transparent) (bug #32275). Rik <rik@octave.org> parents: 17558 diff changeset	2125 : Matrix ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2126
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2127 draw_marker (x(j1,i), y(j,i1), z(j,i), lc, fc);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2128 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2129 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2130
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2131 end_marker ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2132 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2133 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2134
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	2135 // FIXME: global optimization (rendering, data structures...), there
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	2136 // is probably a smarter/faster/less-memory-consuming way to do this.
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	2137 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2138 opengl_renderer::draw_patch (const patch::properties &props)
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	2139 {
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2140 const Matrix f = props.get_faces ().matrix_value ();
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2141 const Matrix v = xform.scale (props.get_vertices ().matrix_value ());
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	2142 Matrix c;
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2143 const Matrix n = props.get_vertexnormals ().matrix_value ();
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	2144 Matrix a;
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	2145
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2146 int nv = v.rows ();
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2147 // int vmax = v.columns ();
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2148 int nf = f.rows ();
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2149 int fcmax = f.columns ();
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	2150
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	2151 bool has_z = (v.columns () > 2);
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	2152 bool has_facecolor = false;
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	2153 bool has_facealpha = false;
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	2154
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2155 int fc_mode = ((props.facecolor_is ("none")
11168 36442102c340 Fix treatment of facevertexcdata if facecolor is 'none' with the fltk backend David Bateman <dbateman@free.fr> parents: 11166 diff changeset	2156 \|\| props.facecolor_is_rgb ()) ? 0 :
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2157 (props.facecolor_is ("flat") ? 1 : 2));
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	2158 int fl_mode = (props.facelighting_is ("none") ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2159 (props.facelighting_is ("flat") ? 1 : 2));
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	2160 int fa_mode = (props.facealpha_is_double () ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2161 (props.facealpha_is ("flat") ? 1 : 2));
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2162 int ec_mode = ((props.edgecolor_is ("none")
11168 36442102c340 Fix treatment of facevertexcdata if facecolor is 'none' with the fltk backend David Bateman <dbateman@free.fr> parents: 11166 diff changeset	2163 \|\| props.edgecolor_is_rgb ()) ? 0 :
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2164 (props.edgecolor_is ("flat") ? 1 : 2));
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	2165 int el_mode = (props.edgelighting_is ("none") ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2166 (props.edgelighting_is ("flat") ? 1 : 2));
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	2167 int ea_mode = (props.edgealpha_is_double () ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2168 (props.edgealpha_is ("flat") ? 1 : 2));
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	2169
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	2170 Matrix fcolor = props.get_facecolor_rgb ();
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	2171 Matrix ecolor = props.get_edgecolor_rgb ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2172
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	2173 float as = props.get_ambientstrength ();
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	2174 float ds = props.get_diffusestrength ();
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	2175 float ss = props.get_specularstrength ();
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	2176 float se = props.get_specularexponent ();
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	2177
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	2178 boolMatrix clip (1, nv, false);
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	2179
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	2180 if (has_z)
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	2181 for (int i = 0; i < nv; i++)
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	2182 clip(i) = is_nan_or_inf (v(i,0), v(i,1), v(i,2));
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	2183 else
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	2184 for (int i = 0; i < nv; i++)
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	2185 clip(i) = is_nan_or_inf (v(i,0), v(i,1), 0);
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	2186
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	2187 boolMatrix clip_f (1, nf, false);
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2188 Array<int> count_f (dim_vector (nf, 1), 0);
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	2189
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	2190 for (int i = 0; i < nf; i++)
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	2191 {
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	2192 bool fclip = false;
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	2193 int count = 0;
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	2194
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	2195 for (int j = 0; j < fcmax && ! xisnan (f(i,j)); j++, count++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2196 fclip = (fclip \|\| clip(int (f(i,j) - 1)));
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	2197
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	2198 clip_f(i) = fclip;
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	2199 count_f(i) = count;
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	2200 }
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	2201
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	2202 if (fc_mode > 0 \|\| ec_mode > 0)
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	2203 {
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	2204 c = props.get_color_data ().matrix_value ();
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	2205
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	2206 if (c.rows () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2207 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2208 // Single color specifications, we can simplify a little bit
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2209
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2210 if (fc_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2211 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2212 fcolor = c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2213 fc_mode = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2214 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2215
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2216 if (ec_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2217 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2218 ecolor = c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2219 ec_mode = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2220 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2221
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2222 c = Matrix ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2223 }
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	2224 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2225 has_facecolor = ((c.numel () > 0) && (c.rows () == f.rows ()));
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	2226 }
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	2227
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	2228 if (fa_mode > 0 \|\| ea_mode > 0)
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	2229 {
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	2230 // FIXME: retrieve alpha data from patch object
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	2231 //a = props.get_alpha_data ();
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	2232 has_facealpha = ((a.numel () > 0) && (a.rows () == f.rows ()));
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	2233 }
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	2234
7924 4976f66d469b miscellaneous cleanup John W. Eaton <jwe@octave.org> parents: 7914 diff changeset	2235 octave_idx_type fr = f.rows ();
7914 e998e81224b5 Various compilation fixes for MSVC. John W. Eaton <jwe@octave.org> parents: 7907 diff changeset	2236 std::vector<vertex_data> vdata (f.numel ());
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	2237
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	2238 for (int i = 0; i < nf; i++)
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	2239 for (int j = 0; j < count_f(i); j++)
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	2240 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2241 int idx = int (f(i,j) - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2242
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2243 Matrix vv (1, 3, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2244 Matrix cc;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2245 Matrix nn(1, 3, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2246 double aa = 1.0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2247
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2248 vv(0) = v(idx,0); vv(1) = v(idx,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2249 if (has_z)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2250 vv(2) = v(idx,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2251 // FIXME: uncomment when patch object has normal computation
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2252 //nn(0) = n(idx,0); nn(1) = n(idx,1); nn(2) = n(idx,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2253 if (c.numel () > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2254 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2255 cc.resize (1, 3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2256 if (has_facecolor)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2257 cc(0) = c(i,0), cc(1) = c(i,1), cc(2) = c(i,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2258 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2259 cc(0) = c(idx,0), cc(1) = c(idx,1), cc(2) = c(idx,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2260 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2261 if (a.numel () > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2262 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2263 if (has_facealpha)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2264 aa = a(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2265 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2266 aa = a(idx);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2267 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2268
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2269 vdata[i+j*fr] =
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2270 vertex_data (vv, cc, nn, aa, as, ds, ss, se);
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	2271 }
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	2272
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	2273 if (fl_mode > 0 \|\| el_mode > 0)
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	2274 {
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	2275 float buf[4] = { ss, ss, ss, 1 };
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	2276
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	2277 glMaterialfv (LIGHT_MODE, GL_SPECULAR, buf);
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	2278 glMaterialf (LIGHT_MODE, GL_SHININESS, se);
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	2279 }
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	2280
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	2281 if (! props.facecolor_is ("none"))
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	2282 {
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	2283 // FIXME: adapt to double-radio property
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	2284 if (props.get_facealpha_double () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2285 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2286 if (fc_mode == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2287 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2288 glColor3dv (fcolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2289 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2290 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2291 float cb[4] = { 0, 0, 0, 1 };
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2292
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2293 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2294 cb[i] = (as * fcolor(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2295 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2296
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2297 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2298 cb[i] = ds * fcolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2299 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2300 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2301 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2302
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2303 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2304 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2305
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2306 // FIXME: use __index__ property from patch object
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2307 patch_tesselator tess (this, fc_mode, fl_mode, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2308
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2309 for (int i = 0; i < nf; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2310 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2311 if (clip_f(i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2312 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2313
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2314 tess.begin_polygon (true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2315 tess.begin_contour ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2316
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2317 for (int j = 0; j < count_f(i); j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2318 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2319 vertex_data::vertex_data_rep vv = vdata[i+jfr].get_rep ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2320
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2321 tess.add_vertex (vv->coords.fortran_vec (), vv);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2322 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2323
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2324 tess.end_contour ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2325 tess.end_polygon ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2326 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2327
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2328 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2329 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2330 }
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	2331 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2332 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2333 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2334 }
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	2335 }
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	2336
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	2337 if (! props.edgecolor_is ("none"))
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	2338 {
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	2339 // FIXME: adapt to double-radio property
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	2340 if (props.get_edgealpha_double () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2341 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2342 if (ec_mode == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2343 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2344 glColor3dv (ecolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2345 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2346 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2347 float cb[4] = { 0, 0, 0, 1 };
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2348
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2349 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2350 cb[i] = (as * ecolor(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2351 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2352
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2353 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2354 cb[i] = ds * ecolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2355 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2356 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2357 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2358
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2359 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2360 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2361
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2362 set_linestyle (props.get_linestyle (), false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2363 set_linewidth (props.get_linewidth ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2364
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2365
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2366 // FIXME: use __index__ property from patch object; should we
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2367 // offset patch contour as well?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2368 patch_tesselator tess (this, ec_mode, el_mode);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2369
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2370 for (int i = 0; i < nf; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2371 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2372 if (clip_f(i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2373 {
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2374 // This is an unclosed contour. Draw it as a line
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2375 bool flag = false;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2376
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2377 for (int j = 0; j < count_f(i); j++)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2378 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2379 if (! clip(int (f(i,j) - 1)))
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2380 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2381 vertex_data::vertex_data_rep vv = vdata[i+jfr].get_rep ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2382 const Matrix m = vv->coords;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2383 if (! flag)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2384 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2385 flag = true;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2386 glBegin (GL_LINE_STRIP);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2387 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2388 glVertex3d (m(0), m(1), m(2));
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2389 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2390 else if (flag)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2391 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2392 flag = false;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2393 glEnd ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2394 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2395 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2396
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2397 if (flag)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2398 glEnd ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2399 }
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2400 else
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2401 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2402 tess.begin_polygon (false);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2403 tess.begin_contour ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2404
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2405 for (int j = 0; j < count_f(i); j++)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2406 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2407 vertex_data::vertex_data_rep vv = vdata[i+jfr].get_rep ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2408 tess.add_vertex (vv->coords.fortran_vec (), vv);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2409 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2410
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2411 tess.end_contour ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2412 tess.end_polygon ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2413 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2414 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2415
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2416 set_linestyle ("-");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2417 set_linewidth (0.5);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2418
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2419 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2420 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2421 }
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	2422 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2423 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2424 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2425 }
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	2426 }
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	2427
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	2428 if (! props.marker_is ("none") &&
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	2429 ! (props.markeredgecolor_is ("none") && props.markerfacecolor_is ("none")))
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	2430 {
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2431 bool do_edge = ! props.markeredgecolor_is ("none");
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2432 bool do_face = ! props.markerfacecolor_is ("none");
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2433
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2434 Matrix mecolor = props.get_markeredgecolor_rgb ();
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2435 Matrix mfcolor = props.get_markerfacecolor_rgb ();
12446 f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2436
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2437 bool has_markerfacecolor = false;
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2438
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2439 if ((mecolor.numel () == 0 && ! props.markeredgecolor_is ("none"))
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2440 \|\| (mfcolor.numel () == 0 && ! props.markerfacecolor_is ("none")))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2441 {
12446 f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2442 Matrix mc = props.get_color_data ().matrix_value ();
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2443
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2444 if (mc.rows () == 1)
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2445 {
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2446 // Single color specifications, we can simplify a little bit
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2447
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2448 if (mfcolor.numel () == 0
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2449 && ! props.markerfacecolor_is ("none"))
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2450 mfcolor = mc;
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2451
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2452 if (mecolor.numel () == 0
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2453 && ! props.markeredgecolor_is ("none"))
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2454 mecolor = mc;
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2455 }
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2456 else
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2457 {
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2458 if (c.numel () == 0)
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2459 c = props.get_color_data ().matrix_value ();
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 12965 diff changeset	2460 has_markerfacecolor = ((c.numel () > 0)
12446 f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2461 && (c.rows () == f.rows ()));
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2462 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2463 }
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2464
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2465
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2466 init_marker (props.get_marker (), props.get_markersize (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2467 props.get_linewidth ());
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2468
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2469 for (int i = 0; i < nf; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2470 for (int j = 0; j < count_f(i); j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2471 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2472 int idx = int (f(i,j) - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2473
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2474 if (clip(idx))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2475 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2476
12446 f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2477 Matrix cc;
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2478 if (c.numel () > 0)
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2479 {
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2480 cc.resize (1, 3);
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2481 if (has_markerfacecolor)
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2482 cc(0) = c(i,0), cc(1) = c(i,1), cc(2) = c(i,2);
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2483 else
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2484 cc(0) = c(idx,0), cc(1) = c(idx,1), cc(2) = c(idx,2);
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2485 }
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2486
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2487 Matrix lc = (do_edge ? (mecolor.numel () == 0 ? cc : mecolor)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2488 : Matrix ());
12446 f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2489 Matrix fc = (do_face ? (mfcolor.numel () == 0 ? cc : mfcolor)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2490 : Matrix ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2491
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2492 draw_marker (v(idx,0), v(idx,1), (has_z ? v(idx,2) : 0), lc, fc);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2493 }
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2494
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2495 end_marker ();
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	2496 }
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	2497 }
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	2498
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2499 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2500 opengl_renderer::draw_hggroup (const hggroup::properties &props)
7866 35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2501 {
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2502 draw (props.get_children ());
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2503 }
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2504
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2505 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2506 opengl_renderer::draw_text (const text::properties& props)
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2507 {
12965 22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12684 diff changeset	2508 if (props.get_string ().is_empty ())
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2509 return;
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2510
13961 0fea4cf22f88 restore legend text with OpenGL + FLTK graphics (bug #34907) John W. Eaton <jwe@octave.org> parents: 13758 diff changeset	2511 Matrix pos = xform.scale (props.get_data_position ());
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2512 const Matrix bbox = props.get_extent_matrix ();
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2513
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2514 // FIXME: handle margin and surrounding box
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2515 bool blend = glIsEnabled (GL_BLEND);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2516
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2517 glEnable (GL_BLEND);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2518 glEnable (GL_ALPHA_TEST);
13961 0fea4cf22f88 restore legend text with OpenGL + FLTK graphics (bug #34907) John W. Eaton <jwe@octave.org> parents: 13758 diff changeset	2519 glRasterPos3d (pos(0), pos(1), pos.numel () > 2 ? pos(2) : 0.0);
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2520 glBitmap (0, 0, 0, 0, bbox(0), bbox(1), 0);
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2521 glDrawPixels (bbox(2), bbox(3),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2522 GL_RGBA, GL_UNSIGNED_BYTE, props.get_pixels ().data ());
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2523 glDisable (GL_ALPHA_TEST);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2524 if (! blend)
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2525 glDisable (GL_BLEND);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2526
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2527 }
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2528
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2529 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2530 opengl_renderer::draw_image (const image::properties& props)
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2531 {
9884 fed4aad2cdca handle indexed images in opengl renderer Shai Ayal <shaiay@users.sourceforge.net> parents: 9834 diff changeset	2532 octave_value cdata = props.get_color_data ();
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2533 dim_vector dv (cdata.dims ());
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2534 int h = dv(0), w = dv(1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2535
11093 d748acc75658 gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab. Ben Abbott <bpabbott@mac.com> parents: 11026 diff changeset	2536 Matrix x = props.get_xdata ().matrix_value ();
d748acc75658 gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab. Ben Abbott <bpabbott@mac.com> parents: 11026 diff changeset	2537 Matrix y = props.get_ydata ().matrix_value ();
d748acc75658 gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab. Ben Abbott <bpabbott@mac.com> parents: 11026 diff changeset	2538
15069 7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14861 diff changeset	2539 // Someone wants us to draw an empty image? No way.
7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14861 diff changeset	2540 if (x.is_empty () \|\| y.is_empty ())
7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14861 diff changeset	2541 return;
7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14861 diff changeset	2542
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2543 if (w > 1 && x(1) == x(0))
11093 d748acc75658 gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab. Ben Abbott <bpabbott@mac.com> parents: 11026 diff changeset	2544 x(1) = x(1) + (w-1);
d748acc75658 gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab. Ben Abbott <bpabbott@mac.com> parents: 11026 diff changeset	2545
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2546 if (h > 1 && y(1) == y(0))
11093 d748acc75658 gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab. Ben Abbott <bpabbott@mac.com> parents: 11026 diff changeset	2547 y(1) = y(1) + (h-1);
d748acc75658 gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab. Ben Abbott <bpabbott@mac.com> parents: 11026 diff changeset	2548
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2549 const ColumnVector p0 = xform.transform (x(0), y(0), 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2550 const ColumnVector p1 = xform.transform (x(1), y(1), 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2551
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2552 // image pixel size in screen pixel units
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2553 float pix_dx, pix_dy;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2554 // image pixel size in normalized units
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2555 float nor_dx, nor_dy;
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2556
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2557 if (w > 1)
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2558 {
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2559 pix_dx = (p1(0) - p0(0))/(w-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2560 nor_dx = (x(1) - x(0))/(w-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2561 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2562 else
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2563 {
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2564 const ColumnVector p1w = xform.transform (x(1) + 1, y(1), 0);
4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2565 pix_dx = p1w(0) - p0(0);
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2566 nor_dx = 1;
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2567 }
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2568
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2569 if (h > 1)
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2570 {
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2571 pix_dy = (p1(1) - p0(1))/(h-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2572 nor_dy = (y(1) - y(0))/(h-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2573 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2574 else
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2575 {
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2576 const ColumnVector p1h = xform.transform (x(1), y(1) + 1, 0);
4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2577 pix_dy = p1h(1) - p0(1);
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2578 nor_dy = 1;
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2579 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2580
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2581
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2582 // OpenGL won't draw the image if it's origin is outside the
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2583 // viewport/clipping plane so we must do the clipping
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2584 // ourselfes - only draw part of the image
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2585
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2586 int j0 = 0, j1 = w;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2587 int i0 = 0, i1 = h;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2588
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2589 float im_xmin = x(0) - nor_dx/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2590 float im_xmax = x(1) + nor_dx/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2591 float im_ymin = y(0) - nor_dy/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2592 float im_ymax = y(1) + nor_dy/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2593 if (props.is_clipping ()) // clip to axes
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2594 {
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2595 if (im_xmin < xmin)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2596 j0 += (xmin - im_xmin)/nor_dx + 1;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2597 if (im_xmax > xmax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2598 j1 -= (im_xmax - xmax)/nor_dx ;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2599
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2600 if (im_ymin < ymin)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2601 i0 += (ymin - im_ymin)/nor_dy + 1;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2602 if (im_ymax > ymax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2603 i1 -= (im_ymax - ymax)/nor_dy;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2604 }
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2605 else // clip to viewport
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2606 {
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2607 GLfloat vp[4];
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2608 glGetFloatv (GL_VIEWPORT, vp);
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2609 // FIXME -- actually add the code to do it!
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2610
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2611 }
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2612
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2613 if (i0 >= i1 \|\| j0 >= j1)
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2614 return;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2615
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2616 glPixelZoom (pix_dx, -pix_dy);
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2617 glRasterPos3d (im_xmin + nor_dxj0, im_ymin + nor_dyi0, 0);
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2618
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2619 // by default this is 4
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2620 glPixelStorei (GL_UNPACK_ALIGNMENT,1);
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2621
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2622 // Expect RGB data
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2623 if (dv.length () == 3 && dv(2) == 3)
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2624 {
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2625 if (cdata.is_double_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2626 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2627 const NDArray xcdata = cdata.array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2628
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2629 OCTAVE_LOCAL_BUFFER (GLfloat, a, 3(j1-j0)(i1-i0));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2630
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2631 for (int i = i0; i < i1; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2632 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2633 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2634 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2635 a[idx] = xcdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2636 a[idx+1] = xcdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2637 a[idx+2] = xcdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2638 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2639 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2640
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2641 draw_pixels (j1-j0, i1-i0, GL_RGB, GL_FLOAT, a);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2642
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2643 }
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2644 else if (cdata.is_uint16_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2645 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2646 const uint16NDArray xcdata = cdata.uint16_array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2647
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2648 OCTAVE_LOCAL_BUFFER (GLushort, a, 3(j1-j0)(i1-i0));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2649
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2650 for (int i = i0; i < i1; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2651 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2652 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2653 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2654 a[idx] = xcdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2655 a[idx+1] = xcdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2656 a[idx+2] = xcdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2657 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2658 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2659
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2660 draw_pixels (j1-j0, i1-i0, GL_RGB, GL_UNSIGNED_SHORT, a);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2661
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2662 }
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2663 else if (cdata.is_uint8_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2664 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2665 const uint8NDArray xcdata = cdata.uint8_array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2666
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2667 OCTAVE_LOCAL_BUFFER (GLubyte, a, 3(j1-j0)(i1-i0));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2668
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2669 for (int i = i0; i < i1; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2670 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2671 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2672 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2673 a[idx] = xcdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2674 a[idx+1] = xcdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2675 a[idx+2] = xcdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2676 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2677 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2678
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2679 draw_pixels (j1-j0, i1-i0, GL_RGB, GL_UNSIGNED_BYTE, a);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2680 }
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2681 else
13219 cf5ebc0e47e4 fix warnings for unused but set variables and shadowed variables John W. Eaton <jwe@octave.org> parents: 13216 diff changeset	2682 warning ("opengl_texture::draw: invalid image data type (expected double, uint16, or uint8)");
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2683 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2684 else
13219 cf5ebc0e47e4 fix warnings for unused but set variables and shadowed variables John W. Eaton <jwe@octave.org> parents: 13216 diff changeset	2685 warning ("opengl_texture::draw: invalid image size (expected nm3 or n*m)");
cf5ebc0e47e4 fix warnings for unused but set variables and shadowed variables John W. Eaton <jwe@octave.org> parents: 13216 diff changeset	2686
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2687 glPixelZoom (1, 1);
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2688 }
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2689
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2690 void
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2691 opengl_renderer::set_viewport (int w, int h)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2692 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2693 glViewport (0, 0, w, h);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2694 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2695
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2696 void
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2697 opengl_renderer::draw_pixels (GLsizei width, GLsizei height, GLenum format,
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2698 GLenum type, const GLvoid *data)
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2699 {
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2700 glDrawPixels (width, height, format, type, data);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2701 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2702
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2703 void
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2704 opengl_renderer::set_color (const Matrix& c)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2705 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2706 glColor3dv (c.data ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2707 #if HAVE_FREETYPE
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2708 text_renderer.set_color (c);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2709 #endif
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2710 }
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2711
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2712 void
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2713 opengl_renderer::set_font (const base_properties& props)
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2714 {
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2715 #if HAVE_FREETYPE
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2716 text_renderer.set_font (props.get ("fontname").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2717 props.get ("fontweight").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2718 props.get ("fontangle").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2719 props.get ("fontsize").double_value ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2720 #endif
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2721 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2722
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2723 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2724 opengl_renderer::set_polygon_offset (bool on, double offset)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2725 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2726 if (on)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2727 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2728 glPolygonOffset (offset, offset);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2729 glEnable (GL_POLYGON_OFFSET_FILL);
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2730 glEnable (GL_POLYGON_OFFSET_LINE);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2731 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2732 else
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2733 {
b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2734 glDisable (GL_POLYGON_OFFSET_FILL);
b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2735 glDisable (GL_POLYGON_OFFSET_LINE);
b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2736 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2737 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2738
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2739 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2740 opengl_renderer::set_linewidth (float w)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2741 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2742 glLineWidth (w);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2743 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2744
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2745 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2746 opengl_renderer::set_linestyle (const std::string& s, bool use_stipple)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2747 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2748 bool solid = false;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2749
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2750 if (s == "-")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2751 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2752 glLineStipple (1, static_cast<unsigned short> (0xFFFF));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2753 solid = true;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2754 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2755 else if (s == ":")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2756 glLineStipple (1, static_cast<unsigned short> (0x8888));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2757 else if (s == "--")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2758 glLineStipple (1, static_cast<unsigned short> (0x0FFF));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2759 else if (s == "-.")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2760 glLineStipple (1, static_cast<unsigned short> (0x020F));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2761 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2762 glLineStipple (1, static_cast<unsigned short> (0x0000));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2763
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2764 if (solid && ! use_stipple)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2765 glDisable (GL_LINE_STIPPLE);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2766 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2767 glEnable (GL_LINE_STIPPLE);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2768 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2769
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2770 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2771 opengl_renderer::set_clipbox (double x1, double x2, double y1, double y2,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2772 double z1, double z2)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2773 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2774 double dx = (x2-x1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2775 double dy = (y2-y1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2776 double dz = (z2-z1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2777
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2778 x1 -= 0.001dx; x2 += 0.001dx;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2779 y1 -= 0.001dy; y2 += 0.001dy;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2780 z1 -= 0.001dz; z2 += 0.001dz;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2781
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2782 ColumnVector p (4, 0.0);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2783
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2784 p(0) = -1; p(3) = x2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2785 glClipPlane (GL_CLIP_PLANE0, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2786 p(0) = 1; p(3) = -x1;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2787 glClipPlane (GL_CLIP_PLANE1, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2788 p(0) = 0; p(1) = -1; p(3) = y2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2789 glClipPlane (GL_CLIP_PLANE2, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2790 p(1) = 1; p(3) = -y1;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2791 glClipPlane (GL_CLIP_PLANE3, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2792 p(1) = 0; p(2) = -1; p(3) = z2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2793 glClipPlane (GL_CLIP_PLANE4, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2794 p(2) = 1; p(3) = -z1;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2795 glClipPlane (GL_CLIP_PLANE5, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2796
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2797 xmin = x1; xmax = x2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2798 ymin = y1; ymax = y2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2799 zmin = z1; zmax = z2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2800 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2801
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2802 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2803 opengl_renderer::set_clipping (bool enable)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2804 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2805 bool has_clipping = (glIsEnabled (GL_CLIP_PLANE0) == GL_TRUE);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2806
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2807 if (enable != has_clipping)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2808 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2809 if (enable)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2810 for (int i = 0; i < 6; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2811 glEnable (GL_CLIP_PLANE0+i);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2812 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2813 for (int i = 0; i < 6; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2814 glDisable (GL_CLIP_PLANE0+i);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2815 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2816 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2817
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2818 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2819 opengl_renderer::init_marker (const std::string& m, double size, float width)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2820 {
8724 a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	2821 #if defined (HAVE_FRAMEWORK_OPENGL)
a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	2822 GLint vw[4];
a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	2823 #else
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2824 int vw[4];
8724 a50228129dba Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation. Ben Abbott <bpabbott@mac.com> parents: 8674 diff changeset	2825 #endif
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2826
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2827 glGetIntegerv (GL_VIEWPORT, vw);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2828
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2829 glMatrixMode (GL_PROJECTION);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2830 glPushMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2831 glLoadIdentity ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2832 glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2833 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2834 glPushMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2835
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2836 set_clipping (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2837 set_linewidth (width);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2838
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2839 marker_id = make_marker_list (m, size, false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2840 filled_marker_id = make_marker_list (m, size, true);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2841 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2842
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2843 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2844 opengl_renderer::end_marker (void)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2845 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2846 glDeleteLists (marker_id, 1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2847 glDeleteLists (filled_marker_id, 1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2848
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2849 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2850 glPopMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2851 glMatrixMode (GL_PROJECTION);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2852 glPopMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2853 set_linewidth (0.5f);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2854 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2855
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2856 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2857 opengl_renderer::draw_marker (double x, double y, double z,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2858 const Matrix& lc, const Matrix& fc)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2859 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2860 ColumnVector tmp = xform.transform (x, y, z, false);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2861
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2862 glLoadIdentity ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2863 glTranslated (tmp(0), tmp(1), -tmp(2));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2864
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2865 if (filled_marker_id > 0 && fc.numel () > 0)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2866 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2867 glColor3dv (fc.data ());
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2868 set_polygon_offset (true, -1.0);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2869 glCallList (filled_marker_id);
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2870 if (lc.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2871 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2872 glColor3dv (lc.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2873 glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2874 glEdgeFlag (GL_TRUE);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2875 set_polygon_offset (true, -2.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2876 glCallList (filled_marker_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2877 glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2878 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2879 set_polygon_offset (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2880 }
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2881 else if (marker_id > 0 && lc.numel () > 0)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2882 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2883 glColor3dv (lc.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2884 glCallList (marker_id);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2885 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2886 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2887
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2888 unsigned int
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2889 opengl_renderer::make_marker_list (const std::string& marker, double size,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2890 bool filled) const
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2891 {
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2892 char c = marker[0];
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2893
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2894 if (filled && (c == '+' \|\| c == 'x' \|\| c == '*' \|\| c == '.'))
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2895 return 0;
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2896
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2897 unsigned int ID = glGenLists (1);
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	2898 double sz = size * toolkit.get_screen_resolution () / 72.0;
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2899
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2900 // constants for the * marker
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2901 const double sqrt2d4 = 0.35355339059327;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2902 double tt = sz*sqrt2d4;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2903
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2904 glNewList (ID, GL_COMPILE);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2905
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2906 switch (marker[0])
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2907 {
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2908 case '+':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2909 glBegin (GL_LINES);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2910 glVertex2f (-sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2911 glVertex2f (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2912 glVertex2f (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2913 glVertex2f (0, sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2914 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2915 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2916 case 'x':
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2917 glBegin (GL_LINES);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2918 glVertex2f (-sz/2, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2919 glVertex2f (sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2920 glVertex2f (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2921 glVertex2f (sz/2, -sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2922 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2923 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2924 case '*':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2925 glBegin (GL_LINES);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2926 glVertex2f (-sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2927 glVertex2f (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2928 glVertex2f (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2929 glVertex2f (0, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2930 glVertex2f (-tt, -tt);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2931 glVertex2f (+tt, +tt);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2932 glVertex2f (-tt, +tt);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2933 glVertex2f (+tt, -tt);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2934 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2935 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2936 case '.':
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2937 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2938 double ang_step = M_PI / 5;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2939
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2940 glBegin (GL_POLYGON);
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2941 for (double ang = 0; ang < (2*M_PI); ang += ang_step)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2942 glVertex2d (szcos (ang)/3, szsin (ang)/3);
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2943 glEnd ();
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2944 }
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2945 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2946 case 's':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2947 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2948 glVertex2d (-sz/2, -sz/2);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2949 glVertex2d (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2950 glVertex2d (sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2951 glVertex2d (sz/2, -sz/2);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14838 diff changeset	2952 glEnd ();
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2953 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2954 case 'o':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2955 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2956 double ang_step = M_PI / 5;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2957
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2958 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2959 for (double ang = 0; ang < (2*M_PI); ang += ang_step)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2960 glVertex2d (szcos (ang)/2, szsin (ang)/2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2961 glEnd ();
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2962 }
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2963 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2964 case 'd':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2965 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2966 glVertex2d (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2967 glVertex2d (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2968 glVertex2d (0, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2969 glVertex2d (-sz/2, 0);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14838 diff changeset	2970 glEnd ();
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2971 break;
10835 4bbd6f75f173 gl-render.cc: Transpose markers '^' and 'v'. Ben Abbott <bpabbott@mac.com> parents: 10402 diff changeset	2972 case 'v':
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2973 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2974 glVertex2f (0, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2975 glVertex2f (sz/2, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2976 glVertex2f (-sz/2, -sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2977 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2978 break;
10835 4bbd6f75f173 gl-render.cc: Transpose markers '^' and 'v'. Ben Abbott <bpabbott@mac.com> parents: 10402 diff changeset	2979 case '^':
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2980 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2981 glVertex2f (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2982 glVertex2f (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2983 glVertex2f (sz/2, sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2984 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2985 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2986 case '>':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2987 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2988 glVertex2f (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2989 glVertex2f (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2990 glVertex2f (-sz/2, -sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2991 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2992 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2993 case '<':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2994 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2995 glVertex2f (-sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2996 glVertex2f (sz/2, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2997 glVertex2f (sz/2, sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2998 glEnd ();
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2999 break;
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3000 case 'p':
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3001 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3002 double ang;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3003 double r;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	3004 double dr = 1.0 - sin (M_PI/10)/sin (3M_PI/10)1.02;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	3005
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3006 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3007 for (int i = 0; i < 2*5; i++)
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3008 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3009 ang = (-0.5 + double(i+1)/5) * M_PI;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	3010 r = 1.0 - (dr * fmod (double(i+1), 2.0));
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	3011 glVertex2d (szrcos (ang)/2, szrsin (ang)/2);
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3012 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3013 glEnd ();
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3014 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3015 break;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3016 case 'h':
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3017 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3018 double ang;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3019 double r;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	3020 double dr = 1.0 - 0.5/sin (M_PI/3)*1.02;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	3021
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3022 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3023 for (int i = 0; i < 2*6; i++)
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3024 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3025 ang = (0.5 + double(i+1)/6.0) * M_PI;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	3026 r = 1.0 - (dr * fmod (double(i+1), 2.0));
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	3027 glVertex2d (szrcos (ang)/2, szrsin (ang)/2);
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3028 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3029 glEnd ();
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3030 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3031 break;
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3032 default:
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	3033 warning ("opengl_renderer: unsupported marker '%s'",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3034 marker.c_str ());
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3035 break;
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3036 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3037
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3038 glEndList ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3039
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3040 return ID;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3041 }
7874 e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7870 diff changeset	3042
9834 92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3043 void
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3044 opengl_renderer::text_to_pixels (const std::string& txt,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3045 uint8NDArray& pixels,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3046 Matrix& bbox,
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3047 int halign, int valign, double rotation)
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3048 {
12333 f103b9c1ca05 use text_renderer object only when freetye is available Kai Habel <kai.habel@gmx.de> parents: 12327 diff changeset	3049 #if HAVE_FREETYPE
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3050 text_renderer.text_to_pixels (txt, pixels, bbox,
17269 5b088598df1d Add simple TeX parser based on flex/bison. Michael Goffioul <michael.goffioul@gmail.com> parents: 16892 diff changeset	3051 halign, valign, rotation, "none");
12333 f103b9c1ca05 use text_renderer object only when freetye is available Kai Habel <kai.habel@gmx.de> parents: 12327 diff changeset	3052 #endif
9834 92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3053 }
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3054
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3055 Matrix
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3056 opengl_renderer::render_text (const std::string& txt,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3057 double x, double y, double z,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3058 int halign, int valign, double rotation)
9834 92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3059 {
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3060 #if HAVE_FREETYPE
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3061 if (txt.empty ())
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3062 return Matrix (1, 4, 0.0);
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3063
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3064 uint8NDArray pixels;
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3065 Matrix bbox;
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3066 text_to_pixels (txt, pixels, bbox, halign, valign, rotation);
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3067
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3068 bool blend = glIsEnabled (GL_BLEND);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3069
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3070 glEnable (GL_BLEND);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3071 glEnable (GL_ALPHA_TEST);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3072 glRasterPos3d (x, y, z);
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3073 glBitmap(0, 0, 0, 0, bbox(0), bbox(1), 0);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3074 glDrawPixels (bbox(2), bbox(3),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3075 GL_RGBA, GL_UNSIGNED_BYTE, pixels.data ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3076 glDisable (GL_ALPHA_TEST);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3077 if (! blend)
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3078 glDisable (GL_BLEND);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3079
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3080 return bbox;
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3081 #else
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	3082 ::warning ("render_text: cannot render text, Freetype library not available");
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3083 return Matrix (1, 4, 0.0);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3084 #endif
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3085 }
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3086
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	3087 #endif

Mercurial > octave

annotate libinterp/corefcn/gl-render.cc @ 17651:b0f529c3671d