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

annotate libinterp/corefcn/gl-render.cc @ 17335:fe6518a1d87c

Move TeX symbol decoding into the lexer (bug #39831). * libinterp/Makefile.am (BUILT_SOURCES): Add corefcn/oct-tex-symbols.cc. (BUILT_DISTFILES): Add corefcn/oct-tex-lexer.ll and corefcn/oct-tex-symbols.cc. (EXTRA_DIST): Add corefcn/oct-tex-lexer.in.ll and corefcn/oct-tex-symbols.in. (ULT_DIST_SRC): Filter out corefcn/oct-tex-lexer.ll from DIST_SRC and add corefcn/oct-tex-lexer.in.ll instead. (CLEAN_FILES): Add corefcn/oct-tex-parser.output. * libinterp/corefcn/modules.mk (corefcn/oct-tex-lexer.ll, corefcn/oct-tex-symbols.cc): New rules to build the TeX lexer. (corefcn/txt-eng.cc): Add dependency on corefcn/oct-tex-symbols.cc. * libinterp/corefcn/oct-tex-lexer.in.ll: Renamed from oct-tex.lexer.ll. Remove COMMAND state. Remove ID regex. Replace rules for symbols with tag @SYMBOL_RULES@. * libinterp/corefcn/oct-tex-parser.yy (ID, CMD, identifier): Remove tokens. (SYM, sym): New token and value. (symbol_element): Build from SYM. * libinterp/corefcn/oct-tex-symbols.in: New file with supported TeX symbols and corresponding codes (unicode and MS symbols). * libinterp/corefcn/txt-eng.h (class text_element_symbol): Make it inherit from text_element. (text_element_symbol::code): Removed member. (text_element_symbol::symbol): New member. (text_element_symbol::text_element_symbol): Adapt constructor. (text_element_symbol::get_symbol): New method. (text_element_symbol::get_symbol_code): Make const. * libinterp/corefcn/txt-eng.cc (symbol_names, symbol_codes): Remove static variables, now auto-generated from oct-tex-symbols.in. (oct-tex-symbols.cc): New include. (text_element_symbol::get_symbol_code): Change implementation to simply index into auto-generated symbol_codes array. * libinterp/corefcn/txt-eng-ft.cc (ft_render::visit(text_element_symbol)): Don't use text_element_symbol::string_value(), use text_element_symbol::get_symbol() instead.

author	Michael Goffioul <michael.goffioul@gmail.com>
date	Sat, 24 Aug 2013 14:27:09 -0400
parents	5b088598df1d
children

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
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	47 static octave_idx_type
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	48 xmin (octave_idx_type x, octave_idx_type y)
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	49 {
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	50 return x < y ? x : y;
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	51 }
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	52
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	53 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	54 opengl_texture
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	55 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	56 protected:
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	57 class texture_rep
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	58 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	59 public:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	60 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	61 : 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	62 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	63 { }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	64
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	65 texture_rep (GLuint id_arg, int w_arg, int h_arg, int tw_arg, int th_arg)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	66 : id (id_arg), w (w_arg), h (h_arg), tw (tw_arg), th (th_arg),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	67 tx (double(w)/tw), ty (double(h)/th), valid (true),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	68 count (1) { }
7831 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 ~texture_rep (void)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	71 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	72 if (valid)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	73 glDeleteTextures (1, &id);
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	74 }
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 void bind (int mode) const
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	77 { if (valid) glBindTexture (mode, id); }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	78
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	79 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	80 { if (valid) glTexCoord2d (qtx, rty); }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	81
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	82 GLuint id;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	83 int w, h;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	84 int tw, th;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	85 double tx, ty;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	86 bool valid;
12125 a21a3875ca83 implement a common class for reference counts Jaroslav Hajek <highegg@gmail.com> parents: 12122 diff changeset	87 octave_refcount<int> count;
7831 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
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	90 texture_rep *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 private:
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	93 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	94
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	95 public:
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	96 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	97
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	98 opengl_texture (const opengl_texture& tx)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	99 : rep (tx.rep)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	100 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	101 rep->count++;
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 (void)
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
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	110 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	111 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	112 if (--rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	113 delete rep;
7831 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 rep = tx.rep;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	116 rep->count++;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	117
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	118 return *this;
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
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	121 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	122
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	123 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	124 { rep->bind (mode); }
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 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	127 { rep->tex_coord (q, r); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	128
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	129 bool is_valid (void) const
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	130 { return rep->valid; }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	131 };
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	132
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	133 static int
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	134 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	135 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	136 int m = 1;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	137
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	138 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	139 m <<= 1;
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 return m;
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
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	144 opengl_texture
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	145 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	146 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	147 opengl_texture retval;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	148
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	149 dim_vector dv (data.dims ());
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	150
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	151 // Expect RGB data
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	152 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	153 {
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	154 // FIXME -- dim_vectors hold octave_idx_type values. Should we
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	155 // 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	156 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	157 GLuint id;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	158 bool ok = true;
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 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	161 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	162
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	163 glGenTextures (1, &id);
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	164 glBindTexture (GL_TEXTURE_2D, id);
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	165
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	166 if (data.is_double_type ())
10315 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 const NDArray xdata = data.array_value ();
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 OCTAVE_LOCAL_BUFFER (float, a, (3twth));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	171
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	172 for (int i = 0; i < h; i++)
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 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	175 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	176 a[idx] = xdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	177 a[idx+1] = xdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	178 a[idx+2] = xdata(i,j,2);
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 }
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 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	183 GL_RGB, GL_FLOAT, a);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	184 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	185 else if (data.is_uint8_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	186 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	187 const uint8NDArray xdata = data.uint8_array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	188
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	189 OCTAVE_LOCAL_BUFFER (octave_uint8, a, (3twth));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	190
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	191 for (int i = 0; i < h; i++)
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 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	194 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	195 a[idx] = xdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	196 a[idx+1] = xdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	197 a[idx+2] = xdata(i,j,2);
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	200
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	201 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	202 GL_RGB, GL_UNSIGNED_BYTE, a);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	203 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	204 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	205 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	206 ok = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	207 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	208 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	209
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	210 if (ok)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	211 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	212 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	213 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	214
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	215 if (glGetError () != GL_NO_ERROR)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	216 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	217 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	218 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	219 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	220 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	221 else
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	222 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	223
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	224 return retval;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	225 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	226
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 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	228 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	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:
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	231 #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	232 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	233 #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	234 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	235 #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	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 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	238
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	239 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	240
8ff92634982d Add initial 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 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	242 { 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	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 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	245 {
8ff92634982d Add initial 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 gluTessProperty (glu_tess, GLU_TESS_BOUNDARY_ONLY,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	247 (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	248 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	249 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	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
8ff92634982d Add initial 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 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	253 { 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	254
8ff92634982d Add initial 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 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	256 { 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	257
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	258 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	259 { 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	260
8ff92634982d Add initial 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 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	262 { 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	263
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	264 protected:
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	265 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	266
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	267 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	268
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	269 virtual void vertex (void /data*/) { }
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	270
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	271 virtual void combine (GLdouble /c/[3], void /data*/[4],
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	272 GLfloat /w/[4], void */out_data*/) { }
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	273
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	274 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	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 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	277 { ::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	278
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	279 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	280 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	281 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	282
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	283 gluTessCallback (glu_tess, GLU_TESS_BEGIN_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	284 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	285 gluTessCallback (glu_tess, GLU_TESS_END_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	286 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	287 gluTessCallback (glu_tess, GLU_TESS_VERTEX_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	288 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	289 gluTessCallback (glu_tess, GLU_TESS_COMBINE_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	290 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	291 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	292 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	293 gluTessCallback (glu_tess, GLU_TESS_ERROR_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	294 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	295 }
8ff92634982d Add initial 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
8ff92634982d Add initial 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 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	298
8ff92634982d Add initial 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 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	300 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	301 { 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	302
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	303 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	304 { reinterpret_cast<opengl_tesselator *> (t)->end (); }
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_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	307 { 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	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_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	310 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	311 { 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	312
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	313 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	314 { 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	315
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	316 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	317 { 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	318
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	319 private:
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	320
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	321 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	322
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	323 opengl_tesselator (const opengl_tesselator&);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	324
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	325 opengl_tesselator operator = (const opengl_tesselator&);
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	326
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	327 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	328 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	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
8ff92634982d Add initial 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 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	332 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	333 {
8ff92634982d Add initial 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 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	335 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	336 {
8ff92634982d Add initial 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 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	338 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	339 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	340 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	341 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	342 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	343 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	344 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	345 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	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 // reference counter
12125 a21a3875ca83 implement a common class for reference counts Jaroslav Hajek <highegg@gmail.com> parents: 12122 diff changeset	348 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	349
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	350 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	351 : 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	352 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	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 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	355 double a, float as, float ds, float ss, float se)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	356 : coords (c), color (col), normal (n), alpha (a),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	357 ambient (as), diffuse (ds), specular (ss), specular_exp (se),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	358 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	359 };
8ff92634982d Add initial 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 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	362 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	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 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	365 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	366 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	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 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	369 }
8ff92634982d Add initial 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 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	372 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	373 { 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	374
8ff92634982d Add initial 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 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	376 { 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	377
8ff92634982d Add initial 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 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	379 double a, float as, float ds, float ss, float 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	380 : 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	381 { }
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	382
8ff92634982d Add initial 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 vertex_data (vertex_data_rep *new_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	384 : rep (new_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	385
8ff92634982d Add initial 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 ~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	387 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	388 if (--rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	389 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	390 }
8ff92634982d Add initial 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
8ff92634982d Add initial 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 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	393 {
8ff92634982d Add initial 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 if (--rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	395 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	396
8ff92634982d Add initial 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 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	398 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	399
8ff92634982d Add initial 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 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	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
8ff92634982d Add initial 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 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	404 };
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	405
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	406 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	407 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	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 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	410 patch_tesselator (opengl_renderer *r, int cmode, int lmode, int idx = 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	411 : opengl_tesselator (), renderer (r),
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	412 color_mode (cmode), light_mode (lmode), index (idx),
12164 18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12126 diff changeset	413 first (true), tmp_vdata ()
18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12126 diff changeset	414 { }
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	415
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	416 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	417 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	418 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	419 //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	420 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	421
8ff92634982d Add initial 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 if (color_mode == 2 \|\| light_mode == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	423 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	424 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	425 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	426
8ff92634982d Add initial 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 if (is_filled ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	428 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	429
8ff92634982d Add initial 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 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	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 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	434 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	435 //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	436 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	437 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	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
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	440 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	441 {
8ff92634982d Add initial 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 vertex_data::vertex_data_rep *v
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	443 = 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	444 //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	445
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	446 // 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	447 // 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	448 // 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	449 // 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	450 // 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	451 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	452 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	453 Matrix col = v->color;
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 if (col.numel () == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	456 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	457 glColor3dv (col.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	458 if (light_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	459 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	460 float buf[4] = { 0, 0, 0, 1 };
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	461
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	462 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	463 buf[k] = (v->ambient * col(k));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	464 glMaterialfv (LIGHT_MODE, GL_AMBIENT, buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	465
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	466 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	467 buf[k] = (v->diffuse * col(k));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	468 glMaterialfv (LIGHT_MODE, GL_AMBIENT, buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	469 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	470 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	471 }
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	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 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	474 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	475
8ff92634982d Add initial 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 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	477
8ff92634982d Add initial 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 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	479 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	480
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	481 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	482 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	483 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	484 //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	485
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	486 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	487 int vmax = 4;
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	488
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	489 for (int i = 0; i < 4; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	490 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	491 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	492
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	493 if (vmax == 4 && ! v[i])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	494 vmax = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	495 }
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	496
8ff92634982d Add initial 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 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	498 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	499 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	500 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	501
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	502 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	503 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	504 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	505
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	506 if (v[0]->color.numel ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	507 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	508 cc.resize (1, 3, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	509 for (int ic = 0; ic < 3; ic++)
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 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	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 if (v[0]->normal.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	515 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	516 for (int in = 0; in < 3; in++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	517 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	518 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	519 }
7837 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 for (int iv = 0; iv < vmax; iv++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	522 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	523
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	524 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	525 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	526 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	527
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	528 *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	529 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	530
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	531 private:
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	532
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	533 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	534
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	535 patch_tesselator (const patch_tesselator&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	536
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	537 patch_tesselator& operator = (const patch_tesselator&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	538
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	539 opengl_renderer *renderer;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	540 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	541 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	542 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	543 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	544 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	545 };
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	546
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	547 void
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	548 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	549 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	550 if (! go.valid_object ())
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	551 return;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	552
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	553 const base_properties& props = go.get_properties ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	554
14838 1abb7c083171 Make sure opengl_renderer::toolkit is defined. Michael Goffioul <michael.goffioul@gmail.com> parents: 14138 diff changeset	555 if (! toolkit)
1abb7c083171 Make sure opengl_renderer::toolkit is defined. Michael Goffioul <michael.goffioul@gmail.com> parents: 14138 diff changeset	556 toolkit = props.get_toolkit ();
1abb7c083171 Make sure opengl_renderer::toolkit is defined. Michael Goffioul <michael.goffioul@gmail.com> parents: 14138 diff changeset	557
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	558 if (go.isa ("figure"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	559 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	560 else if (go.isa ("axes"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	561 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	562 else if (go.isa ("line"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	563 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	564 else if (go.isa ("surface"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	565 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	566 else if (go.isa ("patch"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	567 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	568 else if (go.isa ("hggroup"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	569 draw_hggroup (dynamic_cast<const hggroup::properties&> (props));
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	570 else if (go.isa ("text"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	571 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	572 else if (go.isa ("image"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	573 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	574 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	575 \|\| 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	576 \|\| 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	577 /* SKIP */;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	578 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	579 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	580 if (toplevel)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	581 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	582 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	583 else
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	584 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	585 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	586 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	587 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	588 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	589
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	590 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	591 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	592 {
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	593 // Initialize OpenGL context
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	594
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	595 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	596
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	597 // Draw children
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 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	600 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	601
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	602 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	603 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	604 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	605 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	606 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	607 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	608 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	609
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	610 // 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	611
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	612 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	613 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	614
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	615 // Draw children
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	616
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	617 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	618 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	619
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	620 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	621 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	622 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	623 // 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	624
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	625 glEnable (GL_DEPTH_TEST);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	626 glDepthFunc (GL_LEQUAL);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	627 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	628 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	629 glEnable (GL_NORMALIZE);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	630
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13219 diff changeset	631 if (enhanced)
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	632 {
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	633 glEnable (GL_BLEND);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	634 glEnable (GL_LINE_SMOOTH);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	635 }
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	636 else
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	637 {
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	638 glDisable (GL_BLEND);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	639 glDisable (GL_LINE_SMOOTH);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	640 }
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	641
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	642 // Clear background
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	643
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	644 if (c.length () >= 3)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	645 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	646 glClearColor (c(0), c(1), c(2), 1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	647 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	648 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	649 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	650
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	651 void
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	652 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	653 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	654 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	655 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	656 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	657 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	658 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	659 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	660 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	661 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	662 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	663 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	664 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	665 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	666 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	667 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	668 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	669 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	670 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	671 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	672 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	673 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	674 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	675 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	676 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	677 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	678 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	679 {
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, val, p2N);
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, val, p2);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	682 }
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 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	685 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	686 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	687 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	688 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	689 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	690 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	691 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	692 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	693 glEnd ();
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	694 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	695 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	696
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	697 void
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	698 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	699 double lim1, double lim2,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	700 double p1, double p1N,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	701 double p2, double p2N,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	702 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	703 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	704 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	705 glBegin (GL_LINES);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	706
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	707 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	708 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	709 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	710
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	711 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	712 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	713 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	714 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	715 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	716 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	717 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	718 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	719 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	720 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	721 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	722 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	723 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	724 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	725 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	726 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	727 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	728 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	729 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	730 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	731 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	732 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	733 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	734 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	735 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	736 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	737 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	738 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	739 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	740 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	741 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	742 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	743 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	744 }
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	745
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	746 glEnd ();
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	747 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	748
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	749 void
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	750 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	751 const string_vector& ticklabels,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	752 double lim1, double lim2,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	753 double p1, double p2,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	754 int xyz, int ha, int va,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	755 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	756 {
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	757 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	758 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	759
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	760 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	761 return;
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	762
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	763 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	764 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	765 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	766
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	767 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	768 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	769 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	770
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	771 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	772 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	773 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	774
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	775 // 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	776 // 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	777 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	778 {
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	779 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	780 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	781 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	782 {
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	783 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	784 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	785 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	786 {
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 15467 diff changeset	787 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	788 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	789
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	790 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	791 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	792 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	793 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	794 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	795
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	796 void
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	797 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	798 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	799 // setup OpenGL transformation
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	800
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	801 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	802
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	803 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	804 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	805
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	806 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	807 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	808
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	809 #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	810 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	811 #else
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	812 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	813 #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	814
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	815 glGetIntegerv (GL_VIEWPORT, vw);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	816
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	817 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	818 glLoadIdentity ();
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	819 glScaled (1, 1, -1);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	820 glMultMatrixd (x_mat1.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	821 glMatrixMode (GL_PROJECTION);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	822 glLoadIdentity ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	823 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	824 glMultMatrixd (x_mat2.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	825 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	826
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	827 glClear (GL_DEPTH_BUFFER_BIT);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	828
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	829 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	830
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	831 // store axes transformation data
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	832
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	833 xform = props.get_transform ();
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	834 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	835
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	836 void
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	837 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	838 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	839 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	840 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	841 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	842 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	843 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	844 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	845
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	846 // Axes planes
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	847 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	848 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	849 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	850 set_color (axe_color);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	851 set_polygon_offset (true, 2.5);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	852
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	853 glBegin (GL_QUADS);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	854
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	855 // X plane
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	856 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	857 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	858 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	859 glVertex3d (xPlane, yPlaneN, zPlane);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	860
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	861 // Y plane
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	862 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	863 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	864 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	865 glVertex3d (xPlaneN, yPlane, zPlane);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	866
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	867 // Z plane
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	868 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	869 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	870 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	871 glVertex3d (xPlaneN, yPlane, zPlane);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	872
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	873 glEnd ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	874
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	875 set_polygon_offset (false);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	876 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	877 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	878
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	879 void
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	880 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	881 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	882 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	883 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	884 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	885 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	886 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	887 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	888 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	889 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	890 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	891 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	892 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	893 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	894 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	895
13216 434e227b100b Improvements to plotyy. Ben Abbott <bpabbott@mac.com> parents: 13141 diff changeset	896 bool plotyy = (props.has_property ("__plotyy_axes__"));
12443 24b38afd6a45 fix plotyy bugs #31800, #32211 Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	897
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	898 // Axes box
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 set_linestyle ("-", true);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	901 set_linewidth (props.get_linewidth ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	902
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	903 if (props.is_visible ())
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	904 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	905 glBegin (GL_LINES);
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 // X box
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	908 set_color (props.get_xcolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	909 glVertex3d (xPlaneN, ypTick, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	910 glVertex3d (xPlane, ypTick, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	911
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	912 if (props.is_box ())
12321 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 glVertex3d (xPlaneN, ypTickN, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	915 glVertex3d (xPlane, ypTickN, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	916 glVertex3d (xPlaneN, ypTickN, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	917 glVertex3d (xPlane, ypTickN, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	918 glVertex3d (xPlaneN, ypTick, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	919 glVertex3d (xPlane, ypTick, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	920 }
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 // Y box
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	923 set_color (props.get_ycolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	924 glVertex3d (xpTick, yPlaneN, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	925 glVertex3d (xpTick, yPlane, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	926
12443 24b38afd6a45 fix plotyy bugs #31800, #32211 Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	927 if (props.is_box () && ! plotyy)
12321 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 glVertex3d (xpTickN, yPlaneN, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	930 glVertex3d (xpTickN, yPlane, zpTick);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	931 glVertex3d (xpTickN, yPlaneN, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	932 glVertex3d (xpTickN, yPlane, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	933 glVertex3d (xpTick, yPlaneN, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	934 glVertex3d (xpTick, yPlane, zpTickN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	935 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	936
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	937 // Z box
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	938 set_color (props.get_zcolor_rgb ());
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 if (xySym)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	941 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	942 glVertex3d (xPlaneN, yPlane, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	943 glVertex3d (xPlaneN, yPlane, zPlane);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	944 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	945 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	946 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	947 glVertex3d (xPlane, yPlaneN, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	948 glVertex3d (xPlane, yPlaneN, zPlane);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	949 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	950
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	951 if (props.is_box ())
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	952 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	953 glVertex3d (xPlane, yPlane, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	954 glVertex3d (xPlane, yPlane, zPlane);
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 if (xySym)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	957 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	958 glVertex3d (xPlane, yPlaneN, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	959 glVertex3d (xPlane, yPlaneN, zPlane);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	960 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	961 else
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 glVertex3d (xPlaneN, yPlane, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	964 glVertex3d (xPlaneN, yPlane, zPlane);
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 glVertex3d (xPlaneN, yPlaneN, zPlaneN);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	968 glVertex3d (xPlaneN, yPlaneN, zPlane);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	969 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	970
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	971 glEnd ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	972 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	973 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	974
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	975 void
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	976 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	977 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	978 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	979 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	980 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	981 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	982 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	983 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	984 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	985 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	986 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	987 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	988 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	989 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	990 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	991 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	992 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	993 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	994 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	995 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	996 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	997 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	998
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	999 // X grid
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1000
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1001 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	1002 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1003 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	1004 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	1005 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	1006 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	1007 bool do_xminortick = props.is_xminortick ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1008 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	1009 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	1010 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	1011 int wmax = 0, hmax = 0;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1012 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	1013 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	1014
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1015 set_color (props.get_xcolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1016
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1017 // grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1018 if (do_xgrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1019 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	1020 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1021 zPlaneN, 0, (zstate != AXE_DEPTH_DIR));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1022
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1023 // tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1024 if (tick_along_z)
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, ypTick,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1027 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	1028 signum (zpTick-zpTickN)fzxticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1029 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 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1032 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1033 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	1034 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	1035 signum (ypTick-ypTickN)fyxticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1036 0., 0, mirror);
12321 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
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1039 // tick texts
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1040 if (xticklabels.numel () > 0)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1041 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1042 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	1043 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	1044
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1045 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1046 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	1047 zpTick+signum (zpTick-zpTickN)fzxtickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1048 0, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1049 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1050 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	1051 ypTick+signum (ypTick-ypTickN)fyxtickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1052 zpTick, 0, halign, valign, wmax, hmax);
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
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1055 // minor grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1056 if (do_xminorgrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1057 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	1058 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1059 zPlaneN, 0, (zstate != AXE_DEPTH_DIR));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1060
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1061 // minor tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1062 if (do_xminortick)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1063 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1064 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1065 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	1066 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	1067 signum (zpTick-zpTickN)fzxticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1068 0, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1069 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1070 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	1071 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	1072 signum (ypTick-ypTickN)fyxticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1073 0., 0, mirror);
12321 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
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1076 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	1077 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1078 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1079 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	1080 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1081
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1082 void
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1083 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	1084 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1085 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	1086 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	1087 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	1088 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	1089 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	1090 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	1091 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	1092 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	1093 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	1094 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	1095 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	1096 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	1097 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	1098 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	1099 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	1100 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	1101 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	1102 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	1103 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	1104 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	1105
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1106 // Y grid
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1107
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1108 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	1109 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1110 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	1111 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	1112 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	1113 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	1114 bool do_yminortick = props.is_yminortick ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1115 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	1116 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	1117 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	1118 int wmax = 0, hmax = 0;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1119 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	1120 bool mirror = props.is_box () && ystate != AXE_ANY_DIR
13216 434e227b100b Improvements to plotyy. Ben Abbott <bpabbott@mac.com> parents: 13141 diff changeset	1121 && (! props.has_property ("__plotyy_axes__"));
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1122
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1123 set_color (props.get_ycolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1124
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1125 // grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1126 if (do_ygrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1127 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	1128 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1129 zPlaneN, 1, (zstate != AXE_DEPTH_DIR));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1130
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1131 // tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1132 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1133 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	1134 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	1135 signum (zpTick-zpTickN)fzyticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1136 1, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1137 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1138 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	1139 zpTick, zpTick,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1140 signum (xPlaneN-xPlane)fxyticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1141 0., 0., 1, mirror);
12321 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 // tick texts
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1144 if (yticklabels.numel () > 0)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1145 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1146 int halign = (ystate == AXE_HORZ_DIR
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1147 ? 1 : (!xyzSym \|\| y2Dright ? 0 : 2));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1148 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	1149
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1150 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1151 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	1152 zpTick+signum (zpTick-zpTickN)fzytickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1153 1, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1154 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1155 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	1156 xpTick+signum (xpTick-xpTickN)fxytickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1157 zpTick, 1, halign, valign, wmax, hmax);
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
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1160 // minor grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1161 if (do_yminorgrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1162 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	1163 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane,
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1164 zPlaneN, 1, (zstate != AXE_DEPTH_DIR));
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1165
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1166 // minor tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1167 if (do_yminortick)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1168 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1169 if (tick_along_z)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1170 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	1171 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	1172 signum (zpTick-zpTickN)fzyticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1173 1, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1174 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1175 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	1176 zpTick, zpTick,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1177 signum (xpTick-xpTickN)fxyticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1178 0., 0., 1, mirror);
12321 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
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1181 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	1182 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1183 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1184 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	1185 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1186
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1187 void
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1188 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	1189 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1190 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	1191 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	1192 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	1193 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	1194 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	1195 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	1196 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	1197 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	1198 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	1199 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	1200 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	1201 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	1202 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	1203
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1204 // Z Grid
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1205
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1206 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	1207 {
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1208 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	1209 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	1210 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	1211 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	1212 bool do_zminortick = props.is_zminortick ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1213 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	1214 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	1215 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	1216 int wmax = 0, hmax = 0;
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1217 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	1218
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1219 set_color (props.get_zcolor_rgb ());
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1220
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1221 // grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1222 if (do_zgrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1223 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	1224 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1225
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1226 // tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1227 if (xySym)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1228 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1229 if (xisinf (fy))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1230 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	1231 yPlane, yPlane,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1232 signum (xPlaneN-xPlane)fxzticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1233 0., 0., 2, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1234 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1235 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	1236 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	1237 signum (yPlane-yPlaneN)fyzticklen,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1238 0., 2, false);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1239 }
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 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1242 if (xisinf (fx))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1243 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	1244 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	1245 signum (yPlaneN-yPlane)fyzticklen,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1246 0., 2, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1247 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1248 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	1249 yPlaneN, yPlane,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1250 signum (xPlane-xPlaneN)fxzticklen,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1251 0., 0., 2, false);
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
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1254 // FIXME: tick texts
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1255 if (zticklabels.numel () > 0)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1256 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1257 int halign = 2;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1258 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	1259
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1260 if (xySym)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1261 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1262 if (xisinf (fy))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1263 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	1264 xPlaneN+signum (xPlaneN-xPlane)fxztickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1265 yPlane, 2, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1266 else
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, xPlaneN,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1268 yPlane+signum (yPlane-yPlaneN)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 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1271 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1272 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1273 if (xisinf (fx))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1274 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	1275 yPlaneN+signum (yPlaneN-yPlane)fyztickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1276 2, halign, valign, wmax, hmax);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1277 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1278 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	1279 xPlane+signum (xPlane-xPlaneN)fxztickoffset,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1280 yPlaneN, 2, halign, valign, wmax, hmax);
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 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1283
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1284 // minor grid lines
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1285 if (do_zminorgrid)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1286 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	1287 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1288
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1289 // minor tick marks
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1290 if (do_zminortick)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1291 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1292 if (xySym)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1293 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1294 if (xisinf (fy))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1295 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	1296 yPlane, yPlane,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1297 signum (xPlaneN-xPlane)fxzticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1298 0., 0., 2, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1299 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1300 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	1301 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	1302 signum (yPlane-yPlaneN)fyzticklen/2,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1303 0., 2, false);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1304 }
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 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1307 if (xisinf (fx))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1308 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	1309 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	1310 signum (yPlaneN-yPlane)fyzticklen/2,
12684 abfcb5d5641b Disable mirrored axes ticks for plottyy in ftlk Konstantinos Poulios <logari81@googlemail.com> parents: 12446 diff changeset	1311 0., 2, mirror);
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1312 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1313 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	1314 yPlaneN, yPlaneN,
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1315 signum (xPlane-xPlaneN)fxzticklen/2,
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1316 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	1317 }
12321 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
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1320 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	1321 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1322 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1323 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	1324 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1325
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1326 void
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1327 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	1328 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1329 // Children
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1330
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1331 GLboolean antialias;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1332 glGetBooleanv (GL_LINE_SMOOTH, &antialias);
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 if (antialias == GL_TRUE)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1335 glEnable (GL_LINE_SMOOTH);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1336
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1337 Matrix children = props.get_all_children ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1338 std::list<graphics_object> obj_list;
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1339 std::list<graphics_object>::iterator it;
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 // 1st pass: draw light objects
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 // 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	1344 // 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	1345
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1346 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	1347 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1348 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	1349
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1350 if (go.get_properties ().is_visible ())
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 if (go.isa ("light"))
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1353 draw (go);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1354 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1355 obj_list.push_back (go);
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 }
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 // 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	1360
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1361 it = obj_list.begin ();
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1362 while (it != obj_list.end ())
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1363 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1364 graphics_object go = (*it);
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 // 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	1367 // to "data"
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1368 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	1369 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1370 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	1371 draw (go);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1372
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1373 it = obj_list.erase (it);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1374 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1375 else
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1376 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
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1379 // 3rd pass: draw remaining objects
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1380
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1381 glDisable (GL_DEPTH_TEST);
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 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	1384 {
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1385 graphics_object go = (*it);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1386
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1387 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	1388 draw (go);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1389 }
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 glEnable (GL_DEPTH_TEST);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1392
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1393 set_clipping (false);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1394
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1395 // FIXME: finalize rendering (transparency processing)
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1396 // FIXME: draw zoom box, if needed
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1397 }
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1398
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1399 void
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1400 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	1401 {
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1402 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	1403 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	1404 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	1405 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	1406 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	1407 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	1408
12321 6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1409 setup_opengl_transformation (props);
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1410
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1411 // draw axes object
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1412
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1413 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	1414 draw_axes_boxes (props);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1415
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1416 set_font (props);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1417
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12321 diff changeset	1418 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	1419 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	1420 draw_axes_z_grid (props);
7825 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 set_linestyle ("-");
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1423
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12333 diff changeset	1424 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	1425
6ba28900706b opengl_renderer::draw_axes: simplify with subfunctions John W. Eaton <jwe@octave.org> parents: 12174 diff changeset	1426 draw_axes_children (props);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1427 }
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 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	1430 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	1431 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1432 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	1433 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	1434 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	1435
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1436 bool has_z = (z.numel () > 0);
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	1437 int n = static_cast<int> (::xmin (::xmin (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	1438 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	1439
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1440 std::vector<octave_uint8> clip (n);
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 if (has_z)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1443 for (int i = 0; i < n; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1444 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	1445 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1446 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1447 double z_mid = (zmin+zmax)/2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1448
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1449 for (int i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1450 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	1451 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1452
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1453 if (! props.linestyle_is ("none"))
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1454 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1455 set_color (props.get_color_rgb ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1456 set_linestyle (props.get_linestyle (), false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1457 set_linewidth (props.get_linewidth ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1458
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1459 if (has_z)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1460 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1461 bool flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1462
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1463 for (int i = 1; i < n; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1464 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1465 if ((clip[i-1] & clip[i]) == clip_ok)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1466 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1467 if (! flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1468 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1469 flag = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1470 glBegin (GL_LINE_STRIP);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1471 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	1472 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1473 glVertex3d (x(i), y(i), z(i));
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 else if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1476 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1477 flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1478 glEnd ();
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 }
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 if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1483 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1484 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1485 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1486 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1487 bool flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1488
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1489 for (int i = 1; i < n; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1490 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1491 if ((clip[i-1] & clip[i]) == clip_ok)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1492 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1493 if (! flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1494 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1495 flag = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1496 glBegin (GL_LINE_STRIP);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1497 glVertex2d (x(i-1), y(i-1));
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 glVertex2d (x(i), y(i));
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 else if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1502 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1503 flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1504 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1505 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1506 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1507
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1508 if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1509 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1510 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1511
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1512 set_linewidth (0.5);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1513 set_linestyle ("-");
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
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1516 set_clipping (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1517
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1518 if (! props.marker_is ("none") &&
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1519 ! (props.markeredgecolor_is ("none")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1520 && props.markerfacecolor_is ("none")))
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 Matrix lc, fc;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1523
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1524 if (props.markeredgecolor_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1525 lc = props.get_color_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1526 else if (! props.markeredgecolor_is ("none"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1527 lc = props.get_markeredgecolor_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1528
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1529 if (props.markerfacecolor_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1530 fc = props.get_color_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1531 else if (! props.markerfacecolor_is ("none"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1532 fc = props.get_markerfacecolor_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1533
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1534 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	1535 props.get_linewidth ());
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 for (int i = 0; i < n; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1538 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1539 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	1540 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	1541 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	1542 lc, fc);
7825 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
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1545 end_marker ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1546 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1547
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1548 set_clipping (props.is_clipping ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1549 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1550
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1551 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	1552 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	1553 {
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	1554 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	1555 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	1556 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	1557
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1558 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	1559
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1560 NDArray c;
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	1561 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	1562
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1563 // FIXME: handle transparency
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1564 Matrix a;
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1565
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1566 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	1567 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	1568
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1569 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	1570 (props.facecolor_is ("flat") ? 1 :
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1571 (props.facecolor_is ("interp") ? 2 :
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1572 (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	1573 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	1574 (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	1575 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	1576 (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	1577 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	1578 (props.edgecolor_is ("flat") ? 1 :
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1579 (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	1580 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	1581 (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	1582 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	1583 (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	1584
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1585 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	1586 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	1587
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1588 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	1589 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	1590 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	1591 float se = props.get_specularexponent ();
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1592 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	1593 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	1594
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1595 opengl_texture tex;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1596
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1597 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	1598 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	1599 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	1600
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1601 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	1602
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1603 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	1604
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1605 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	1606 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1607 if (x_mat)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1608 i1 = i;
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1609
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1610 for (int j = 0; j < zc; j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1611 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1612 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1613 j1 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1614
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1615 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	1616 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1617 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1618
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1619 if ((fc_mode > 0 && fc_mode < 3) \|\| ec_mode > 0)
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1620 c = props.get_color_data ().array_value ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1621
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1622 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	1623 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1624 // FIXME: implement alphadata conversion
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1625 //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	1626 }
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 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	1629 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1630 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	1631
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1632 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	1633 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	1634 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1635
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1636 // 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	1637 // 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	1638 if (fc_mode == 3)
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1639 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	1640
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1641 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	1642 {
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	1643 if (props.get_facealpha_double () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1644 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1645 if (fc_mode == 0 \|\| fc_mode == 3)
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 glColor3dv (fcolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1648 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1649 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1650 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1651 cb[i] = as * fcolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1652 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1653
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1654 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1655 cb[i] = ds * fcolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1656 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1657 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1658 }
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 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1661 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1662 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	1663 set_polygon_offset (true, 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1664 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1665 glEnable (GL_TEXTURE_2D);
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 for (int i = 1; i < zc; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1668 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1669 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1670 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1671 i1 = i-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1672 i2 = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1673 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1674
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1675 for (int j = 1; j < zr; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1676 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1677 if (clip(j-1, i-1) \|\| clip (j, i-1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1678 \|\| clip (j-1, i) \|\| clip (j, i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1679 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1680
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1681 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1682 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1683 j1 = j-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1684 j2 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1685 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1686
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1687 glBegin (GL_QUADS);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1688
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1689 // Vertex 1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1690 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1691 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	1692 else if (fc_mode > 0)
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 // 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	1695 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1696 cb[k] = c(j-1, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1697 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1698
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1699 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1700 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1701 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1702 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1703 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1704
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1705 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1706 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	1707 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 }
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1710 if (fl_mode > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1711 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1712 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	1713 + 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	1714 + 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	1715 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	1716 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1717 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	1718
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1719 // Vertex 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1720 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1721 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	1722 else if (fc_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1723 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1724 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1725 cb[k] = c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1726 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1727
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1728 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1729 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1730 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1731 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1732 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1733
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1734 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1735 cb[k] = ds * c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1736 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 }
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1739
0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1740 if (fl_mode == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1741 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1742 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	1743 + 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	1744 + 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	1745 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	1746 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1747
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1748 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	1749
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1750 // Vertex 3
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1751 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1752 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	1753 else if (fc_mode == 2)
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 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1756 cb[k] = c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1757 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1758
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1759 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1760 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1761 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1762 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1763 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1764
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1765 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1766 cb[k] = ds * c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1767 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 }
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1770 if (fl_mode == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1771 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1772 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	1773 + n(j,i,1) * n(j,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1774 + n(j,i,2) * n(j,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1775 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	1776 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1777 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	1778
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1779 // Vertex 4
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1780 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1781 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	1782 else if (fc_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1783 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1784 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1785 cb[k] = c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1786 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1787
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1788 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1789 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1790 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1791 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1792 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1793
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1794 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1795 cb[k] = ds * c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1796 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1799 if (fl_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1800 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1801 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	1802 + 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	1803 + 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	1804 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	1805 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1806 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	1807
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1808 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1809 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1810 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1811
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1812 set_polygon_offset (false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1813 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1814 glDisable (GL_TEXTURE_2D);
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 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1817 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1818 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1819 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1820 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1821 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1822 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1823 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1824
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1825 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	1826 {
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	1827 if (props.get_edgealpha_double () == 1)
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 if (ec_mode == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1830 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1831 glColor3dv (ecolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1832 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1833 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1834 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1835 cb[i] = as * ecolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1836 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1837
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1838 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1839 cb[i] = ds * ecolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1840 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1843
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1844 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1845 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1846 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	1847
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1848 set_linestyle (props.get_linestyle (), false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1849 set_linewidth (props.get_linewidth ());
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 // Mesh along Y-axis
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1852
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1853 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	1854 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1855 for (int i = 0; i < zc; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1856 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1857 if (y_mat)
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 i1 = i-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1860 i2 = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1861 }
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 j = 1; j < zr; j++)
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 (clip(j-1,i) \|\| clip(j,i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1866 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1867
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1868 if (x_mat)
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 j1 = j-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1871 j2 = 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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1874 glBegin (GL_LINES);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1875
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1876 // Vertex 1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1877 if (ec_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1878 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1879 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1880 cb[k] = c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1881 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1882
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1883 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1884 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1885 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1886 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1887 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1888
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1889 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1890 cb[k] = ds * c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1891 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1892 }
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 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1895 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1896 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	1897 + 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	1898 + 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	1899 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	1900 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1901 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	1902
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1903 // Vertex 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1904 if (ec_mode == 2)
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] = c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1908 glColor3fv (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 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1911 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1912 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1913 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1914 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1915
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1916 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1917 cb[k] = ds * c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1918 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1919 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1920 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1921 if (el_mode == 2)
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1922 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1923 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	1924 + n(j,i,1) * n(j,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1925 + n(j,i,2) * n(j,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1926 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	1927 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1928 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	1929
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1930 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1931 }
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1934
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1935 // Mesh along X-axis
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 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	1938 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1939 for (int j = 0; j < zr; j++)
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 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1942 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1943 j1 = j-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1944 j2 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1945 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1946
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1947 for (int i = 1; i < zc; i++)
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 if (clip(j,i-1) \|\| clip(j,i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1950 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1951
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1952 if (y_mat)
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 i1 = i-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1955 i2 = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1956 }
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 glBegin (GL_LINES);
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 // Vertex 1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1961 if (ec_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1962 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1963 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1964 cb[k] = c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1965 glColor3fv (cb);
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 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1968 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1969 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1970 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1971 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1972
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1973 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1974 cb[k] = ds * c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1975 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1976 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1977 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1978 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1979 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1980 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	1981 + 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	1982 + 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	1983 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	1984 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1985 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	1986
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1987 // Vertex 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1988 if (ec_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1989 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1990 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1991 cb[k] = c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1992 glColor3fv (cb);
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 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1995 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1996 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1997 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1998 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1999
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2000 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2001 cb[k] = ds * c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2002 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2003 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2004 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2005 if (el_mode == 2)
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 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	2008 + n(j,i,1) * n(j,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2009 + n(j,i,2) * n(j,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2010 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	2011 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2012 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	2013
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2014 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2015 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2016 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2017 }
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 set_linestyle ("-");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2020 set_linewidth (0.5);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2021
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2022 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2023 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2024 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2025 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2026 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2027 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2028 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2029 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2030
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2031 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	2032 ! (props.markeredgecolor_is ("none")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2033 && 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	2034 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2035 // 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	2036 // 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	2037 // 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	2038
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2039 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	2040 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	2041
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2042 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	2043 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	2044 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	2045
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2046 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	2047 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2048 mecolor = props.get_edgecolor_rgb ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2049 do_edge = ! props.edgecolor_is ("none");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2050 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2051
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2052 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	2053 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2054 mfcolor = props.get_facecolor_rgb ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2055 do_face = ! props.facecolor_is ("none");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2056 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2057
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2058 if ((mecolor.numel () == 0 \|\| mfcolor.numel () == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2059 && c.numel () == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2060 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	2061
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2062 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	2063 props.get_linewidth ());
7829 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 for (int i = 0; i < zc; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2066 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2067 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2068 i1 = i;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2069
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2070 for (int j = 0; j < zr; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2071 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2072 if (clip(j,i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2073 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2074
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2075 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2076 j1 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2077
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2078 if ((do_edge && mecolor.numel () == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2079 \|\| (do_face && mfcolor.numel () == 0))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2080 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2081 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2082 cc(k) = c(j,i,k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2083 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2084
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2085 Matrix lc = (do_edge ? (mecolor.numel () == 0 ? cc : mecolor) : Matrix ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2086 Matrix fc = (do_face ? (mfcolor.numel () == 0 ? cc : mfcolor) : Matrix ());
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 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	2089 }
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 end_marker ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2093 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2094 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2095
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	2096 // 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	2097 // 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	2098 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2099 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	2100 {
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2101 const Matrix f = props.get_faces ().matrix_value ();
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2102 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	2103 Matrix c;
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2104 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	2105 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	2106
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2107 int nv = v.rows ();
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2108 // int vmax = v.columns ();
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2109 int nf = f.rows ();
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2110 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	2111
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2112 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	2113 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	2114 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	2115
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2116 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	2117 \|\| 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	2118 (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	2119 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	2120 (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	2121 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	2122 (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	2123 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	2124 \|\| 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	2125 (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	2126 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	2127 (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	2128 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	2129 (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	2130
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2131 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	2132 Matrix ecolor = props.get_edgecolor_rgb ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2133
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	2134 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	2135 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	2136 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	2137 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	2138
8ff92634982d Add initial 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 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	2140
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2141 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	2142 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	2143 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	2144 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	2145 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	2146 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	2147
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2148 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	2149 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	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 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	2152 {
8ff92634982d Add initial 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 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	2154 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	2155
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2156 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	2157 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	2158
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2159 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	2160 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	2161 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2162
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2163 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	2164 {
8ff92634982d Add initial 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 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	2166
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2167 if (c.rows () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2168 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2169 // 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	2170
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2171 if (fc_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2172 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2173 fcolor = c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2174 fc_mode = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2175 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2176
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2177 if (ec_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2178 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2179 ecolor = c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2180 ec_mode = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2181 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2182
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2183 c = Matrix ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2184 }
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	2185 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2186 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	2187 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2188
8ff92634982d Add initial 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 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	2190 {
8ff92634982d Add initial 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 // 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	2192 //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	2193 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	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
7924 4976f66d469b miscellaneous cleanup John W. Eaton <jwe@octave.org> parents: 7914 diff changeset	2196 octave_idx_type fr = f.rows ();
7914 e998e81224b5 Various compilation fixes for MSVC. John W. Eaton <jwe@octave.org> parents: 7907 diff changeset	2197 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	2198
8ff92634982d Add initial 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 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	2200 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	2201 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2202 int idx = int (f(i,j) - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2203
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2204 Matrix vv (1, 3, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2205 Matrix cc;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2206 Matrix nn(1, 3, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2207 double aa = 1.0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2208
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2209 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	2210 if (has_z)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2211 vv(2) = v(idx,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2212 // FIXME: uncomment when patch object has normal computation
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2213 //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	2214 if (c.numel () > 0)
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 cc.resize (1, 3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2217 if (has_facecolor)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2218 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	2219 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2220 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	2221 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2222 if (a.numel () > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2223 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2224 if (has_facealpha)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2225 aa = a(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2226 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2227 aa = a(idx);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2228 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2229
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2230 vdata[i+j*fr] =
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2231 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	2232 }
8ff92634982d Add initial 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 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	2235 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2236 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	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 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	2239 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	2240 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2241
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2242 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	2243 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2244 // 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	2245 if (props.get_facealpha_double () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2246 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2247 if (fc_mode == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2248 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2249 glColor3dv (fcolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2250 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2251 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2252 float cb[4] = { 0, 0, 0, 1 };
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2253
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2254 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2255 cb[i] = (as * fcolor(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2256 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2257
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2258 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2259 cb[i] = ds * fcolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2260 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2261 }
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2264 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2265 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2266
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2267 // FIXME: use __index__ property from patch object
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2268 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	2269
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2270 for (int i = 0; i < nf; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2271 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2272 if (clip_f(i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2273 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2274
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2275 tess.begin_polygon (true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2276 tess.begin_contour ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2277
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2278 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	2279 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2280 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	2281
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2282 tess.add_vertex (vv->coords.fortran_vec (), vv);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2283 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2284
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2285 tess.end_contour ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2286 tess.end_polygon ();
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
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 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2291 }
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	2292 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2293 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2294 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2295 }
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	2296 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2297
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2298 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	2299 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2300 // 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	2301 if (props.get_edgealpha_double () == 1)
10315 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 (ec_mode == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2304 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2305 glColor3dv (ecolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2306 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2307 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2308 float cb[4] = { 0, 0, 0, 1 };
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2309
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2310 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2311 cb[i] = (as * ecolor(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2312 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
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 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2315 cb[i] = ds * ecolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2316 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2317 }
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2320 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2321 glEnable (GL_LIGHTING);
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 set_linestyle (props.get_linestyle (), false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2324 set_linewidth (props.get_linewidth ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2325
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2326
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2327 // 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	2328 // offset patch contour as well?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2329 patch_tesselator tess (this, ec_mode, el_mode);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2330
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2331 for (int i = 0; i < nf; i++)
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 if (clip_f(i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2334 {
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2335 // 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	2336 bool flag = false;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2337
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2338 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	2339 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2340 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	2341 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2342 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	2343 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	2344 if (! flag)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2345 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2346 flag = true;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2347 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	2348 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2349 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	2350 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2351 else if (flag)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2352 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2353 flag = false;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2354 glEnd ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2355 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2356 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2357
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2358 if (flag)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2359 glEnd ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2360 }
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2361 else
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2362 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2363 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	2364 tess.begin_contour ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2365
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2366 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	2367 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2368 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	2369 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	2370 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2371
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2372 tess.end_contour ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2373 tess.end_polygon ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2374 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2375 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2376
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2377 set_linestyle ("-");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2378 set_linewidth (0.5);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2379
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2380 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2381 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2382 }
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	2383 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2384 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2385 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2386 }
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	2387 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2388
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2389 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	2390 ! (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	2391 {
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2392 bool do_edge = ! props.markeredgecolor_is ("none");
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2393 bool do_face = ! props.markerfacecolor_is ("none");
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2394
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2395 Matrix mecolor = props.get_markeredgecolor_rgb ();
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2396 Matrix mfcolor = props.get_markerfacecolor_rgb ();
12446 f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2397
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2398 bool has_markerfacecolor = false;
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2399
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2400 if ((mecolor.numel () == 0 && ! props.markeredgecolor_is ("none"))
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2401 \|\| (mfcolor.numel () == 0 && ! props.markerfacecolor_is ("none")))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2402 {
12446 f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2403 Matrix mc = props.get_color_data ().matrix_value ();
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2404
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2405 if (mc.rows () == 1)
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2406 {
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2407 // 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	2408
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2409 if (mfcolor.numel () == 0
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2410 && ! props.markerfacecolor_is ("none"))
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2411 mfcolor = mc;
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2412
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2413 if (mecolor.numel () == 0
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2414 && ! props.markeredgecolor_is ("none"))
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2415 mecolor = mc;
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2416 }
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2417 else
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2418 {
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2419 if (c.numel () == 0)
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2420 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	2421 has_markerfacecolor = ((c.numel () > 0)
12446 f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2422 && (c.rows () == f.rows ()));
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2423 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2424 }
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2425
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2426
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2427 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	2428 props.get_linewidth ());
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2429
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2430 for (int i = 0; i < nf; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2431 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	2432 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2433 int idx = int (f(i,j) - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2434
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2435 if (clip(idx))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2436 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2437
12446 f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2438 Matrix cc;
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2439 if (c.numel () > 0)
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2440 {
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2441 cc.resize (1, 3);
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2442 if (has_markerfacecolor)
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2443 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	2444 else
f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2445 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	2446 }
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 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	2449 : Matrix ());
12446 f899f451fe76 Fix for fltk patch markers (#31801) David Bateman <dbateman@free.fr> parents: 12443 diff changeset	2450 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	2451 : Matrix ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2452
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2453 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	2454 }
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2455
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2456 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	2457 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2458 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2459
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2460 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2461 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	2462 {
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2463 draw (props.get_children ());
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2464 }
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2465
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2466 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2467 opengl_renderer::draw_text (const text::properties& props)
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2468 {
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	2469 if (props.get_string ().is_empty ())
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2470 return;
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2471
13961 0fea4cf22f88 restore legend text with OpenGL + FLTK graphics (bug #34907) John W. Eaton <jwe@octave.org> parents: 13758 diff changeset	2472 Matrix pos = xform.scale (props.get_data_position ());
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2473 const Matrix bbox = props.get_extent_matrix ();
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2474
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2475 // FIXME: handle margin and surrounding box
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2476 bool blend = glIsEnabled (GL_BLEND);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2477
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2478 glEnable (GL_BLEND);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2479 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	2480 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	2481 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	2482 glDrawPixels (bbox(2), bbox(3),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2483 GL_RGBA, GL_UNSIGNED_BYTE, props.get_pixels ().data ());
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2484 glDisable (GL_ALPHA_TEST);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2485 if (! blend)
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2486 glDisable (GL_BLEND);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2487
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2488 }
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2489
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2490 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2491 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	2492 {
9884 fed4aad2cdca handle indexed images in opengl renderer Shai Ayal <shaiay@users.sourceforge.net> parents: 9834 diff changeset	2493 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	2494 dim_vector dv (cdata.dims ());
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2495 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	2496
11093 d748acc75658 gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab. Ben Abbott <bpabbott@mac.com> parents: 11026 diff changeset	2497 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	2498 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	2499
15069 7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14861 diff changeset	2500 // 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	2501 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	2502 return;
7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14861 diff changeset	2503
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2504 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	2505 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	2506
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2507 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	2508 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	2509
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2510 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	2511 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	2512
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2513 // image pixel size in screen pixel units
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2514 float pix_dx, pix_dy;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2515 // image pixel size in normalized units
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2516 float nor_dx, nor_dy;
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2517
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2518 if (w > 1)
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2519 {
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2520 pix_dx = (p1(0) - p0(0))/(w-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2521 nor_dx = (x(1) - x(0))/(w-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2522 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2523 else
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2524 {
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2525 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	2526 pix_dx = p1w(0) - p0(0);
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2527 nor_dx = 1;
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2528 }
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2529
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2530 if (h > 1)
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2531 {
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2532 pix_dy = (p1(1) - p0(1))/(h-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2533 nor_dy = (y(1) - y(0))/(h-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2534 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2535 else
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2536 {
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2537 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	2538 pix_dy = p1h(1) - p0(1);
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2539 nor_dy = 1;
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2540 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2541
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2542
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2543 // 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	2544 // 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	2545 // ourselfes - only draw part of the image
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2546
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2547 int j0 = 0, j1 = w;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2548 int i0 = 0, i1 = h;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2549
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2550 float im_xmin = x(0) - nor_dx/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2551 float im_xmax = x(1) + nor_dx/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2552 float im_ymin = y(0) - nor_dy/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2553 float im_ymax = y(1) + nor_dy/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2554 if (props.is_clipping ()) // clip to axes
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2555 {
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2556 if (im_xmin < xmin)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2557 j0 += (xmin - im_xmin)/nor_dx + 1;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2558 if (im_xmax > xmax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2559 j1 -= (im_xmax - xmax)/nor_dx ;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2560
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2561 if (im_ymin < ymin)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2562 i0 += (ymin - im_ymin)/nor_dy + 1;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2563 if (im_ymax > ymax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2564 i1 -= (im_ymax - ymax)/nor_dy;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2565 }
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2566 else // clip to viewport
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2567 {
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2568 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	2569 glGetFloatv (GL_VIEWPORT, vp);
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2570 // 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	2571
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2572 }
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2573
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2574 if (i0 >= i1 \|\| j0 >= j1)
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2575 return;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2576
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2577 glPixelZoom (pix_dx, -pix_dy);
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2578 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	2579
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2580 // by default this is 4
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2581 glPixelStorei (GL_UNPACK_ALIGNMENT,1);
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2582
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2583 // Expect RGB data
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2584 if (dv.length () == 3 && dv(2) == 3)
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2585 {
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2586 if (cdata.is_double_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2587 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2588 const NDArray xcdata = cdata.array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2589
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2590 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	2591
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2592 for (int i = i0; i < i1; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2593 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2594 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	2595 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2596 a[idx] = xcdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2597 a[idx+1] = xcdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2598 a[idx+2] = xcdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2599 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2600 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2601
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2602 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	2603
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2604 }
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2605 else if (cdata.is_uint16_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2606 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2607 const uint16NDArray xcdata = cdata.uint16_array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2608
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2609 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	2610
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2611 for (int i = i0; i < i1; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2612 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2613 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	2614 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2615 a[idx] = xcdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2616 a[idx+1] = xcdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2617 a[idx+2] = xcdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2618 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2619 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2620
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2621 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	2622
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2623 }
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2624 else if (cdata.is_uint8_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2625 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2626 const uint8NDArray xcdata = cdata.uint8_array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2627
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2628 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	2629
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2630 for (int i = i0; i < i1; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2631 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2632 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	2633 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2634 a[idx] = xcdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2635 a[idx+1] = xcdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2636 a[idx+2] = xcdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2637 }
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 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	2641 }
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2642 else
13219 cf5ebc0e47e4 fix warnings for unused but set variables and shadowed variables John W. Eaton <jwe@octave.org> parents: 13216 diff changeset	2643 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	2644 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2645 else
13219 cf5ebc0e47e4 fix warnings for unused but set variables and shadowed variables John W. Eaton <jwe@octave.org> parents: 13216 diff changeset	2646 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	2647
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2648 glPixelZoom (1, 1);
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2649 }
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2650
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2651 void
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2652 opengl_renderer::set_viewport (int w, int h)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2653 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2654 glViewport (0, 0, w, h);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2655 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2656
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2657 void
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2658 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	2659 GLenum type, const GLvoid *data)
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2660 {
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2661 glDrawPixels (width, height, format, type, data);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2662 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2663
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2664 void
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2665 opengl_renderer::set_color (const Matrix& c)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2666 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2667 glColor3dv (c.data ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2668 #if HAVE_FREETYPE
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2669 text_renderer.set_color (c);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2670 #endif
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2671 }
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2672
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2673 void
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2674 opengl_renderer::set_font (const base_properties& props)
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2675 {
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2676 #if HAVE_FREETYPE
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2677 text_renderer.set_font (props.get ("fontname").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2678 props.get ("fontweight").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2679 props.get ("fontangle").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2680 props.get ("fontsize").double_value ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2681 #endif
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2682 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2683
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2684 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2685 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	2686 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2687 if (on)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2688 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2689 glPolygonOffset (offset, offset);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2690 glEnable (GL_POLYGON_OFFSET_FILL);
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2691 glEnable (GL_POLYGON_OFFSET_LINE);
7825 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 else
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2694 {
b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2695 glDisable (GL_POLYGON_OFFSET_FILL);
b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2696 glDisable (GL_POLYGON_OFFSET_LINE);
b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2697 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2698 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2699
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2700 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2701 opengl_renderer::set_linewidth (float w)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2702 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2703 glLineWidth (w);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2704 }
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 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2707 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	2708 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2709 bool solid = false;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2710
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2711 if (s == "-")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2712 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2713 glLineStipple (1, static_cast<unsigned short> (0xFFFF));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2714 solid = true;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2715 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2716 else if (s == ":")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2717 glLineStipple (1, static_cast<unsigned short> (0x8888));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2718 else if (s == "--")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2719 glLineStipple (1, static_cast<unsigned short> (0x0FFF));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2720 else if (s == "-.")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2721 glLineStipple (1, static_cast<unsigned short> (0x020F));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2722 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2723 glLineStipple (1, static_cast<unsigned short> (0x0000));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2724
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2725 if (solid && ! use_stipple)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2726 glDisable (GL_LINE_STIPPLE);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2727 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2728 glEnable (GL_LINE_STIPPLE);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2729 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2730
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2731 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2732 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	2733 double z1, double z2)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2734 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2735 double dx = (x2-x1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2736 double dy = (y2-y1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2737 double dz = (z2-z1);
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 x1 -= 0.001dx; x2 += 0.001dx;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2740 y1 -= 0.001dy; y2 += 0.001dy;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2741 z1 -= 0.001dz; z2 += 0.001dz;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2742
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2743 ColumnVector p (4, 0.0);
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 p(0) = -1; p(3) = x2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2746 glClipPlane (GL_CLIP_PLANE0, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2747 p(0) = 1; p(3) = -x1;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2748 glClipPlane (GL_CLIP_PLANE1, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2749 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	2750 glClipPlane (GL_CLIP_PLANE2, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2751 p(1) = 1; p(3) = -y1;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2752 glClipPlane (GL_CLIP_PLANE3, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2753 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	2754 glClipPlane (GL_CLIP_PLANE4, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2755 p(2) = 1; p(3) = -z1;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2756 glClipPlane (GL_CLIP_PLANE5, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2757
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2758 xmin = x1; xmax = x2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2759 ymin = y1; ymax = y2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2760 zmin = z1; zmax = z2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2761 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2762
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2763 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2764 opengl_renderer::set_clipping (bool enable)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2765 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2766 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	2767
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2768 if (enable != has_clipping)
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 if (enable)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2771 for (int i = 0; i < 6; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2772 glEnable (GL_CLIP_PLANE0+i);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2773 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2774 for (int i = 0; i < 6; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2775 glDisable (GL_CLIP_PLANE0+i);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2776 }
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
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2779 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2780 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	2781 {
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	2782 #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	2783 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	2784 #else
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2785 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	2786 #endif
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2787
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2788 glGetIntegerv (GL_VIEWPORT, vw);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2789
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2790 glMatrixMode (GL_PROJECTION);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2791 glPushMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2792 glLoadIdentity ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2793 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	2794 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2795 glPushMatrix ();
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 set_clipping (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2798 set_linewidth (width);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2799
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2800 marker_id = make_marker_list (m, size, false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2801 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	2802 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2803
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2804 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2805 opengl_renderer::end_marker (void)
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 glDeleteLists (marker_id, 1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2808 glDeleteLists (filled_marker_id, 1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2809
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2810 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2811 glPopMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2812 glMatrixMode (GL_PROJECTION);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2813 glPopMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2814 set_linewidth (0.5f);
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 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2818 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	2819 const Matrix& lc, const Matrix& fc)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2820 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2821 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	2822
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2823 glLoadIdentity ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2824 glTranslated (tmp(0), tmp(1), -tmp(2));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2825
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2826 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	2827 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2828 glColor3dv (fc.data ());
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2829 set_polygon_offset (true, -1.0);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2830 glCallList (filled_marker_id);
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2831 if (lc.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2832 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2833 glColor3dv (lc.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2834 glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2835 glEdgeFlag (GL_TRUE);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2836 set_polygon_offset (true, -2.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2837 glCallList (filled_marker_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2838 glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2839 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2840 set_polygon_offset (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2841 }
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2842 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	2843 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2844 glColor3dv (lc.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2845 glCallList (marker_id);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2846 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2847 }
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 unsigned int
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2850 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	2851 bool filled) const
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2852 {
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2853 char c = marker[0];
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2854
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2855 if (filled && (c == '+' \|\| c == 'x' \|\| c == '*' \|\| c == '.'))
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2856 return 0;
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	2857
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2858 unsigned int ID = glGenLists (1);
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	2859 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	2860
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2861 // constants for the * marker
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2862 const double sqrt2d4 = 0.35355339059327;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2863 double tt = sz*sqrt2d4;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2864
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2865 glNewList (ID, GL_COMPILE);
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 switch (marker[0])
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2868 {
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2869 case '+':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2870 glBegin (GL_LINES);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2871 glVertex2f (-sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2872 glVertex2f (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2873 glVertex2f (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2874 glVertex2f (0, sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2875 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2876 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2877 case 'x':
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2878 glBegin (GL_LINES);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2879 glVertex2f (-sz/2, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2880 glVertex2f (sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2881 glVertex2f (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2882 glVertex2f (sz/2, -sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2883 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2884 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2885 case '*':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2886 glBegin (GL_LINES);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2887 glVertex2f (-sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2888 glVertex2f (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2889 glVertex2f (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2890 glVertex2f (0, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2891 glVertex2f (-tt, -tt);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2892 glVertex2f (+tt, +tt);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2893 glVertex2f (-tt, +tt);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2894 glVertex2f (+tt, -tt);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2895 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2896 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2897 case '.':
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2898 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2899 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	2900
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2901 glBegin (GL_POLYGON);
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2902 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	2903 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	2904 glEnd ();
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2905 }
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2906 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2907 case 's':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2908 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2909 glVertex2d (-sz/2, -sz/2);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2910 glVertex2d (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2911 glVertex2d (sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2912 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	2913 glEnd ();
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2914 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2915 case 'o':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2916 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2917 double ang_step = M_PI / 5;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2918
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2919 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2920 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	2921 glVertex2d (szcos (ang)/2, szsin (ang)/2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2922 glEnd ();
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2923 }
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2924 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2925 case 'd':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2926 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2927 glVertex2d (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2928 glVertex2d (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2929 glVertex2d (0, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2930 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	2931 glEnd ();
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2932 break;
10835 4bbd6f75f173 gl-render.cc: Transpose markers '^' and 'v'. Ben Abbott <bpabbott@mac.com> parents: 10402 diff changeset	2933 case 'v':
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2934 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2935 glVertex2f (0, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2936 glVertex2f (sz/2, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2937 glVertex2f (-sz/2, -sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2938 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2939 break;
10835 4bbd6f75f173 gl-render.cc: Transpose markers '^' and 'v'. Ben Abbott <bpabbott@mac.com> parents: 10402 diff changeset	2940 case '^':
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2941 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2942 glVertex2f (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2943 glVertex2f (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2944 glVertex2f (sz/2, sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2945 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2946 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2947 case '>':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2948 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2949 glVertex2f (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2950 glVertex2f (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2951 glVertex2f (-sz/2, -sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2952 glEnd ();
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 '<':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2955 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2956 glVertex2f (-sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2957 glVertex2f (sz/2, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2958 glVertex2f (sz/2, sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2959 glEnd ();
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2960 break;
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2961 case 'p':
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2962 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2963 double ang;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2964 double r;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2965 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	2966
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2967 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	2968 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	2969 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2970 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	2971 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	2972 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	2973 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2974 glEnd ();
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2975 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2976 break;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2977 case 'h':
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2978 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2979 double ang;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2980 double r;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2981 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	2982
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2983 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	2984 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	2985 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2986 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	2987 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	2988 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	2989 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2990 glEnd ();
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2991 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	2992 break;
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2993 default:
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	2994 warning ("opengl_renderer: unsupported marker '%s'",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2995 marker.c_str ());
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	2996 break;
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2997 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2998
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2999 glEndList ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3000
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3001 return ID;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3002 }
7874 e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7870 diff changeset	3003
9834 92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3004 void
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3005 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	3006 uint8NDArray& pixels,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3007 Matrix& bbox,
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3008 int halign, int valign, double rotation)
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3009 {
12333 f103b9c1ca05 use text_renderer object only when freetye is available Kai Habel <kai.habel@gmx.de> parents: 12327 diff changeset	3010 #if HAVE_FREETYPE
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3011 text_renderer.text_to_pixels (txt, pixels, bbox,
17277 5b088598df1d Add simple TeX parser based on flex/bison. Michael Goffioul <michael.goffioul@gmail.com> parents: 16892 diff changeset	3012 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	3013 #endif
9834 92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3014 }
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3015
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3016 Matrix
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3017 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	3018 double x, double y, double z,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3019 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	3020 {
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3021 #if HAVE_FREETYPE
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3022 if (txt.empty ())
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3023 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	3024
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3025 uint8NDArray pixels;
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3026 Matrix bbox;
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3027 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	3028
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3029 bool blend = glIsEnabled (GL_BLEND);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3030
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3031 glEnable (GL_BLEND);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3032 glEnable (GL_ALPHA_TEST);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3033 glRasterPos3d (x, y, z);
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3034 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	3035 glDrawPixels (bbox(2), bbox(3),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3036 GL_RGBA, GL_UNSIGNED_BYTE, pixels.data ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3037 glDisable (GL_ALPHA_TEST);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3038 if (! blend)
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3039 glDisable (GL_BLEND);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3040
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3041 return bbox;
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3042 #else
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	3043 ::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	3044 return Matrix (1, 4, 0.0);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3045 #endif
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3046 }
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3047
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	3048 #endif

Mercurial > hg > octave-lyh

annotate libinterp/corefcn/gl-render.cc @ 17335:fe6518a1d87c