octave-nkf: src/gl-render.cc annotate

annotate src/gl-render.cc @ 12174:db1f49eaba6b

whitespace fixes

author	John W. Eaton <jwe@octave.org>
date	Wed, 26 Jan 2011 23:49:42 -0500
parents	18e9a8da7d18
children	6ba28900706b

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
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11484 diff changeset	3 Copyright (C) 2008-2011 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"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	33 #include "gl-render.h"
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	34 #include "txt-eng.h"
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	35 #include "txt-eng-ft.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	36
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	37 #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	38
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	39 // 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	40 // 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	41 // 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	42 #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	43 #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	44 #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	45
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	46 enum {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	47 AXE_ANY_DIR = 0,
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	48 AXE_DEPTH_DIR = 1,
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	49 AXE_HORZ_DIR = 2,
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	50 AXE_VERT_DIR = 3
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	51 };
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	52
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	53 static octave_idx_type
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	54 xmin (octave_idx_type x, octave_idx_type y)
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	55 {
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	56 return x < y ? x : y;
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	57 }
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	58
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	59 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	60 opengl_texture
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	61 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	62 protected:
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	63 class texture_rep
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	64 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	65 public:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	66 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	67 : 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	68 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	69 { }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	70
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	71 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	72 : 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	73 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	74 count (1) { }
7831 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 ~texture_rep (void)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	77 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	78 if (valid)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	79 glDeleteTextures (1, &id);
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	80 }
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 void bind (int mode) const
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	83 { if (valid) glBindTexture (mode, id); }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	84
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	85 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	86 { if (valid) glTexCoord2d (qtx, rty); }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	87
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	88 GLuint id;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	89 int w, h;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	90 int tw, th;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	91 double tx, ty;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	92 bool valid;
12125 a21a3875ca83 implement a common class for reference counts Jaroslav Hajek <highegg@gmail.com> parents: 12122 diff changeset	93 octave_refcount<int> count;
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	94 };
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	95
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	96 texture_rep *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 private:
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	99 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	100
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	101 public:
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	102 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	103
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	104 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	105 : rep (tx.rep)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	106 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	107 rep->count++;
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 (void)
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
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	116 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	117 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	118 if (--rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	119 delete rep;
7831 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 rep = tx.rep;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	122 rep->count++;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	123
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	124 return *this;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	125 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	126
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	127 static 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	128
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	129 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	130 { rep->bind (mode); }
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 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	133 { rep->tex_coord (q, r); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	134
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	135 bool is_valid (void) const
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	136 { return rep->valid; }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	137 };
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	138
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	139 static int
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	140 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	141 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	142 int m = 1;
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 while (m < n && m < INT_MAX)
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	145 m <<= 1;
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 return m;
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
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	150 opengl_texture
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	151 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	152 {
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	153 opengl_texture retval;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	154
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	155 dim_vector dv (data.dims ());
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	156
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	157 // Expect RGB data
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	158 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	159 {
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	160 // 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	161 // 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	162 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	163 GLuint id;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	164 bool ok = true;
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 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	167 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	168
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	169 glGenTextures (1, &id);
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	170 glBindTexture (GL_TEXTURE_2D, id);
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	171
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	172 if (data.is_double_type ())
10315 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 const NDArray xdata = data.array_value ();
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 OCTAVE_LOCAL_BUFFER (float, a, (3twth));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	177
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	178 for (int i = 0; i < h; i++)
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 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	181 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	182 a[idx] = xdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	183 a[idx+1] = xdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	184 a[idx+2] = xdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	185 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	186 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	187
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	188 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	189 GL_RGB, GL_FLOAT, a);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	190 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	191 else if (data.is_uint8_type ())
10315 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 const uint8NDArray xdata = data.uint8_array_value ();
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 OCTAVE_LOCAL_BUFFER (octave_uint8, a, (3twth));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	196
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	197 for (int i = 0; i < h; i++)
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 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	200 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	201 a[idx] = xdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	202 a[idx+1] = xdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	203 a[idx+2] = xdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	204 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	205 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	206
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	207 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	208 GL_RGB, GL_UNSIGNED_BYTE, a);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	209 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	210 else
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 ok = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	213 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	214 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	215
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	216 if (ok)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	217 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	218 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	219 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	220
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	221 if (glGetError () != GL_NO_ERROR)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	222 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	223 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	224 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	225 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	226 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	227 else
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	228 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	229
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	230 return retval;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	231 }
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	232
7833 8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	233 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	234 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	235 {
8ff92634982d Add initial 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 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	237 #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	238 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	239 #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	240 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	241 #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	242
8ff92634982d Add initial 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 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	244
11584 cda4aa780d58 Another round of initialising members in the constructor initialisation list Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11576 diff changeset	245 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	246
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	247 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	248 { 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	249
8ff92634982d Add initial 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 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	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 gluTessProperty (glu_tess, GLU_TESS_BOUNDARY_ONLY,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	253 (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	254 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	255 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	256 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	257
8ff92634982d Add initial 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_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	259 { 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	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 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	262 { 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	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 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	265 { 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	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 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	268 { 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	269
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	270 protected:
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	271 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	272
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	273 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	274
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	275 virtual void vertex (void /data*/) { }
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	276
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	277 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	278 GLfloat /w/[4], void */out_data*/) { }
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	279
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	280 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	281
8ff92634982d Add initial 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 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	283 { ::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	284
8ff92634982d Add initial 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 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	286 {
8ff92634982d Add initial 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 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	288
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	289 gluTessCallback (glu_tess, GLU_TESS_BEGIN_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	290 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	291 gluTessCallback (glu_tess, GLU_TESS_END_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	292 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	293 gluTessCallback (glu_tess, GLU_TESS_VERTEX_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	294 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	295 gluTessCallback (glu_tess, GLU_TESS_COMBINE_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	296 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	297 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	298 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	299 gluTessCallback (glu_tess, GLU_TESS_ERROR_DATA,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	300 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	301 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	302
8ff92634982d Add initial 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 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	304
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	305 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	306 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	307 { 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	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_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	310 { reinterpret_cast<opengl_tesselator *> (t)->end (); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	311
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	312 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	313 { 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	314
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	315 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	316 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	317 { 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	318
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	319 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	320 { 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	321
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	322 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	323 { 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	324
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	325 private:
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	326
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	327 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	328
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	329 opengl_tesselator (const opengl_tesselator&);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	330
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	331 opengl_tesselator operator = (const opengl_tesselator&);
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	332
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	333 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	334 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	335 };
8ff92634982d Add initial 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 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	338 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	339 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	340 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	341 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	342 {
8ff92634982d Add initial 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 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	344 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	345 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	346 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	347 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	348 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	349 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	350 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	351 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	352
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	353 // reference counter
12125 a21a3875ca83 implement a common class for reference counts Jaroslav Hajek <highegg@gmail.com> parents: 12122 diff changeset	354 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	355
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	356 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	357 : 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	358 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	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 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	361 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	362 : coords (c), color (col), normal (n), alpha (a),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	363 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	364 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	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
8ff92634982d Add initial 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 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	368 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	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 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	371 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	372 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	373
8ff92634982d Add initial 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 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	375 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	376
8ff92634982d Add initial 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 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	378 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	379 { 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	380
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	381 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	382 { 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	383
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	384 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	385 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	386 : 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	387 { }
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	388
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	389 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	390 : 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	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 (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	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
8ff92634982d Add initial 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 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	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 if (--rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	401 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	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 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	404 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	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 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	407 }
8ff92634982d Add initial 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 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	410 };
8ff92634982d Add initial 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
8ff92634982d Add initial 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 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	413 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	414 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	415 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	416 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	417 : 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	418 color_mode (cmode), light_mode (lmode), index (idx),
12164 18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12126 diff changeset	419 first (true), tmp_vdata ()
18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12126 diff changeset	420 { }
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	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 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	423 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	424 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	425 //printf("patch_tesselator::begin (%d)\n", 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	426 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	427
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	428 if (color_mode == 2 \|\| light_mode == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	429 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	430 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	431 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	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 if (is_filled ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	434 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	435
8ff92634982d Add initial 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 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	437 }
8ff92634982d Add initial 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 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	440 {
8ff92634982d Add initial 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 //printf("patch_tesselator::end\n");
8ff92634982d Add initial 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 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	443 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	444 }
8ff92634982d Add initial 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 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	447 {
8ff92634982d Add initial 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 vertex_data::vertex_data_rep *v
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	449 = reinterpret_cast<vertex_data::vertex_data_rep *> (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	450 //printf("patch_tesselator::vertex (%g, %g, %g)\n", v->coords(0), v->coords(1), v->coords(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	451
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	452 // 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	453 // 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	454 // 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	455 // 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	456 // 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	457 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	458 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	459 Matrix col = v->color;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	460
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	461 if (col.numel () == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	462 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	463 glColor3dv (col.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	464 if (light_mode > 0)
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 float buf[4] = { 0, 0, 0, 1 };
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	467
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	468 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	469 buf[k] = (v->ambient * col(k));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	470 glMaterialfv (LIGHT_MODE, GL_AMBIENT, buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	471
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	472 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	473 buf[k] = (v->diffuse * col(k));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	474 glMaterialfv (LIGHT_MODE, GL_AMBIENT, buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	475 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	476 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	477 }
7833 8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	478
8ff92634982d Add initial 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 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	480 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	481
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	482 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	483
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	484 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	485 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	486
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	487 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	488 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	489 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	490 //printf("patch_tesselator::combine\n");
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	491
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	492 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	493 int vmax = 4;
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	494
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	495 for (int i = 0; i < 4; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	496 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	497 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	498
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	499 if (vmax == 4 && ! v[i])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	500 vmax = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	501 }
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	502
8ff92634982d Add initial 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 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	504 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	505 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	506 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	507
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	508 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	509 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	510 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	511
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	512 if (v[0]->color.numel ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	513 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	514 cc.resize (1, 3, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	515 for (int ic = 0; ic < 3; ic++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	516 for (int iv = 0; iv < vmax; iv++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	517 cc(ic) += (w[iv] * v[iv]->color(ic));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	518 }
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	519
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	520 if (v[0]->normal.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	521 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	522 for (int in = 0; in < 3; in++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	523 for (int iv = 0; iv < vmax; iv++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	524 nn(in) += (w[iv] * v[iv]->normal(in));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	525 }
7837 57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	526
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	527 for (int iv = 0; iv < vmax; iv++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	528 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	529
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	530 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	531 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	532 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	533
57095ca98533 Make OpenGL tessellation combine callback robust against NULL vertex data. Michael Goffioul <michael.goffioul@gmail.com> parents: 7834 diff changeset	534 *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	535 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	536
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	537 private:
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	538
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	539 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	540
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	541 patch_tesselator (const patch_tesselator&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	542
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	543 patch_tesselator& operator = (const patch_tesselator&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	544
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	545 opengl_renderer *renderer;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	546 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	547 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	548 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	549 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	550 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	551 };
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	552
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	553 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	554 opengl_renderer::draw (const graphics_object& go)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	555 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	556 if (! go.valid_object ())
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	557 return;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	558
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	559 const base_properties& props = go.get_properties ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	560
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	561 if (go.isa ("figure"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	562 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	563 else if (go.isa ("axes"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	564 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	565 else if (go.isa ("line"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	566 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	567 else if (go.isa ("surface"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	568 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	569 else if (go.isa ("patch"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	570 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	571 else if (go.isa ("hggroup"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	572 draw_hggroup (dynamic_cast<const hggroup::properties&> (props));
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	573 else if (go.isa ("text"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	574 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	575 else if (go.isa ("image"))
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	576 draw_image (dynamic_cast<const image::properties&> (props));
11186 f72e17e70378 gl-render.cc: Do not give rendering error for uimenus. Ben Abbott <bpabbott@mac.com> parents: 11175 diff changeset	577 else if (go.isa ("uimenu"))
f72e17e70378 gl-render.cc: Do not give rendering error for uimenus. Ben Abbott <bpabbott@mac.com> parents: 11175 diff changeset	578 ;
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	579 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	580 warning ("opengl_renderer: cannot render object of type `%s'",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	581 props.graphics_object_name ().c_str ());
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	582 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	583
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	584 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	585 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	586 {
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	587 toolkit = props.get_toolkit ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	588
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	589 // Initialize OpenGL context
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	590
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	591 glEnable (GL_DEPTH_TEST);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	592 glDepthFunc (GL_LEQUAL);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	593 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	594 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	595 glEnable (GL_NORMALIZE);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	596
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	597 if (props.is___enhanced__ ())
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	598 {
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	599 glEnable (GL_BLEND);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	600 glEnable (GL_LINE_SMOOTH);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	601 }
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	602 else
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	603 {
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	604 glDisable (GL_BLEND);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	605 glDisable (GL_LINE_SMOOTH);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	606 }
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	607
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	608 // Clear background
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	609
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	610 Matrix c = props.get_color_rgb ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	611
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	612 if (c.length() >= 3)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	613 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	614 glClearColor (c(0), c(1), c(2), 1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	615 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	616 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	617
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	618 // Draw children
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	619
8263 22c078fd926b make fltk backend figures work again John W. Eaton <jwe@octave.org> parents: 7954 diff changeset	620 draw (props.get_all_children ());
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	621 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	622
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	623 void
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	624 opengl_renderer::render_grid (std::string& gridstyle, Matrix& ticks,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	625 double lim1, double lim2,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	626 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	627 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	628 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	629 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	630 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	631 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	632 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	633 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	634 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	635 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	636 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	637 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	638 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	639 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	640 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	641 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	642 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	643 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	644 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	645 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	646 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	647 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	648 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	649 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	650 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	651 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	652 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	653 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	654 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	655 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	656 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	657 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	658 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	659 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	660 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	661 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	662 }
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 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	665 glEnd ();
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	666 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	667 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	668
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	669 void
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	670 opengl_renderer::render_tickmarks(Matrix& ticks, double lim1, double lim2,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	671 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	672 double dx, double dy, double dz,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	673 int xyz, bool doubleside)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	674 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	675 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	676 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	677 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	678 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	679
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	680 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	681 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	682 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	683 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	684 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	685 glVertex3d (val, p1+dy, p2+dz);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	686 if (doubleside)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	687 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	688 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	689 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	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 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	693 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	694 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	695 glVertex3d (p1+dx, val, p2+dz);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	696 if (doubleside)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	697 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	698 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	699 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	700 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	701 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	702 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	703 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	704 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	705 glVertex3d (p1+dx, p2+dy, val);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	706 if (doubleside)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	707 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	708 glVertex3d (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	709 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	710 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	711 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	712 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	713 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	714 glEnd ();
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	715 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	716
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	717 void
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	718 opengl_renderer::render_ticktexts(Matrix& ticks, string_vector& ticklabels,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	719 double lim1, double lim2,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	720 double p1, double p2,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	721 int xyz, int ha, int va,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	722 int& wmax, int& hmax)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	723 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	724 int n = std::min (ticklabels.numel (), ticks.numel ());
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	725
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	726 for (int i = 0; i < n; i++)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	727 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	728 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	729
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	730 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	731 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	732 Matrix b;
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	733 // FIXME: as tick text is transparent, shouldn't be
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	734 // 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	735 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	736 {
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	737 b = render_text (ticklabels(i), 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	738 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	739 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	740 {
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	741 b = render_text (ticklabels(i), 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	742 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	743 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	744 {
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	745 b = render_text (ticklabels(i), 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	746 }
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 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	749 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	750 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	751 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	752 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	753
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	754 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	755 opengl_renderer::draw_axes (const axes::properties& props)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	756 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	757 // setup OpenGL transformation
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	758
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	759 Matrix x_zlim = props.get_transform_zlim ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	760 Matrix x_mat1 = props.get_opengl_matrix_1 ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	761 Matrix x_mat2 = props.get_opengl_matrix_2 ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	762
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	763 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	764 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	765
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	766 #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	767 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	768 #else
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	769 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	770 #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	771
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	772 glGetIntegerv (GL_VIEWPORT, vw);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	773
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	774 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	775 glLoadIdentity ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	776 glScaled(1, 1, -1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	777 glMultMatrixd (x_mat1.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	778 glMatrixMode (GL_PROJECTION);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	779 glLoadIdentity ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	780 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	781 glMultMatrixd (x_mat2.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	782 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	783
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	784 glClear (GL_DEPTH_BUFFER_BIT);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	785
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	786 // store axes transformation data
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	787
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	788 xform = props.get_transform ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	789
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	790 // draw axes object
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	791
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	792 GLboolean antialias;
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	793 glGetBooleanv (GL_LINE_SMOOTH, &antialias);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	794 glDisable (GL_LINE_SMOOTH);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	795
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	796 Matrix xlim = xform.xscale (props.get_xlim ().matrix_value ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	797 Matrix ylim = xform.yscale (props.get_ylim ().matrix_value ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	798 Matrix zlim = xform.zscale (props.get_zlim ().matrix_value ());
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	799 double x_min = xlim(0), x_max = xlim(1);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	800 double y_min = ylim(0), y_max = ylim(1);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	801 double z_min = zlim(0), z_max = zlim(1);
11484 cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	802
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	803 double xd = (props.xdir_is ("normal") ? 1 : -1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	804 double yd = (props.ydir_is ("normal") ? 1 : -1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	805 double zd = (props.zdir_is ("normal") ? 1 : -1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	806
11484 cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	807 ColumnVector bbox(4);
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	808 bbox(0) = octave_Inf;
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	809 bbox(1) = octave_Inf;
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	810 bbox(2) = -octave_Inf;
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	811 bbox(3) = -octave_Inf;
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	812 for (int i = 0; i <= 1; i++)
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	813 for (int j = 0; j <= 1; j++)
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	814 for (int k = 0; k <= 1; k++)
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	815 {
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	816 ColumnVector p = xform.transform (i ? x_max : x_min, j ? y_max : y_min,
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	817 k ? z_max : z_min, false);
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	818 bbox(0) = std::min (bbox(0), p(0));
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	819 bbox(1) = std::min (bbox(1), p(1));
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	820 bbox(2) = std::max (bbox(2), p(0));
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	821 bbox(3) = std::max (bbox(3), p(1));
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	822 }
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	823 bbox(2) = bbox(2)-bbox(0);
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	824 bbox(3) = bbox(3)-bbox(1);
cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	825
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	826 ColumnVector p1, p2, xv (3), yv (3), zv (3);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	827 int xstate, ystate, zstate;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	828
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	829 xstate = ystate = zstate = AXE_ANY_DIR;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	830
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	831 p1 = xform.transform (x_min, (y_min+y_max)/2, (z_min+z_max)/2, false);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	832 p2 = xform.transform (x_max, (y_min+y_max)/2, (z_min+z_max)/2, false);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	833 xv(0) = xround (p2(0)-p1(0));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	834 xv(1) = xround (p2(1)-p1(1));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	835 xv(2) = (p2(2)-p1(2));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	836 if (xv(0) == 0 && xv(1) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	837 xstate = AXE_DEPTH_DIR;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	838 else if (xv(2) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	839 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	840 if (xv(0) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	841 xstate = AXE_VERT_DIR;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	842 else if (xv(1) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	843 xstate = AXE_HORZ_DIR;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	844 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	845 double xPlane;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	846 if (xv(2) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	847 if (xv(1) == 0)
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	848 xPlane = (xv(0) > 0 ? x_max : x_min);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	849 else
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	850 xPlane = (xv(1) < 0 ? x_max : x_min);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	851 else
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	852 xPlane = (xv(2) < 0 ? x_min : x_max);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	853 double xPlaneN = (xPlane == x_min ? x_max : x_min);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	854 double fx = (x_max-x_min)/sqrt(xv(0)xv(0)+xv(1)xv(1));
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	855
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	856 p1 = xform.transform ((x_min+x_max)/2, y_min, (z_min+z_max)/2, false);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	857 p2 = xform.transform ((x_min+x_max)/2, y_max, (z_min+z_max)/2, false);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	858 yv(0) = xround (p2(0)-p1(0));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	859 yv(1) = xround (p2(1)-p1(1));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	860 yv(2) = (p2(2)-p1(2));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	861 if (yv(0) == 0 && yv(1) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	862 ystate = AXE_DEPTH_DIR;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	863 else if (yv(2) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	864 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	865 if (yv(0) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	866 ystate = AXE_VERT_DIR;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	867 else if (yv(1) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	868 ystate = AXE_HORZ_DIR;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	869 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	870 double yPlane;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	871 if (yv(2) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	872 if (yv(1) == 0)
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	873 yPlane = (yv(0) > 0 ? y_max : y_min);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	874 else
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	875 yPlane = (yv(1) < 0 ? y_max : y_min);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	876 else
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	877 yPlane = (yv(2) < 0 ? y_min : y_max);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	878 double yPlaneN = (yPlane == y_min ? y_max : y_min);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	879 double fy = (y_max-y_min)/sqrt(yv(0)yv(0)+yv(1)yv(1));
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	880
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	881 p1 = xform.transform((x_min+x_max)/2, (y_min+y_max)/2, z_min, false);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	882 p2 = xform.transform((x_min+x_max)/2, (y_min+y_max)/2, z_max, false);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	883 zv(0) = xround(p2(0)-p1(0));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	884 zv(1) = xround (p2(1)-p1(1));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	885 zv(2) = (p2(2)-p1(2));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	886 if (zv(0) == 0 && zv(1) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	887 zstate = AXE_DEPTH_DIR;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	888 else if (zv(2) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	889 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	890 if (zv(0) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	891 zstate = AXE_VERT_DIR;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	892 else if (zv(1) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	893 zstate = AXE_HORZ_DIR;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	894 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	895 double zPlane;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	896 if (zv(2) == 0)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	897 if (zv(1) == 0)
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	898 zPlane = (zv(0) > 0 ? z_min : z_max);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	899 else
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	900 zPlane = (zv(1) < 0 ? z_min : z_max);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	901 else
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	902 zPlane = (zv(2) < 0 ? z_min : z_max);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	903 double zPlaneN = (zPlane == z_min ? z_max : z_min);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	904 double fz = (z_max-z_min)/sqrt(zv(0)zv(0)+zv(1)zv(1));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	905
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	906 bool mode2d = (((xstate > AXE_DEPTH_DIR ? 1 : 0) +
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	907 (ystate > AXE_DEPTH_DIR ? 1 : 0) +
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	908 (zstate > AXE_DEPTH_DIR ? 1 : 0)) == 2);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	909 if (props.tickdirmode_is ("auto"))
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	910 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	911 // FIXME: tickdir should be updated (code below comes
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	912 // from JHandles)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	913 //autoMode++;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	914 //TickDir.set(mode2d ? "in" : "out", true);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	915 //autoMode--;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	916 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	917
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	918 // FIXME: use ticklength property
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	919 double xticklen = 7, yticklen = 7, zticklen = 7;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	920
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	921 //double tickdir = (props.tickdir_is ("in") ? -1 : 1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	922 double tickdir = (props.tickdirmode_is ("auto") ?
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	923 (mode2d ? -1 : 1) :
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	924 (props.tickdir_is ("in") ? -1 : 1));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	925 double xtickoffset = (mode2d && tickdir < 0 ? 0 : xticklen) + 5;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	926 double ytickoffset = (mode2d && tickdir < 0 ? 0 : yticklen) + 5;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	927 double ztickoffset = (mode2d && tickdir < 0 ? 0 : zticklen) + 5;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	928
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	929 bool xySym = (xdyd(xPlane-xPlaneN)*(yPlane-yPlaneN) > 0);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	930 bool x2Dtop = false;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	931 bool y2Dright = false;
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	932 bool layer2Dtop = false;
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	933 bool zSign = (zd*(zPlane-zPlaneN) <= 0);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	934 bool xyzSym = zSign ? xySym : !xySym;
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	935 double xpTick = (zSign ? xPlaneN : xPlane);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	936 double ypTick = (zSign ? yPlaneN : yPlane);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	937 double zpTick = (zSign ? zPlane : zPlaneN);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	938 double xpTickN = (zSign ? xPlane : xPlaneN);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	939 double ypTickN = (zSign ? yPlane : yPlaneN);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	940 double zpTickN = (zSign ? zPlaneN : zPlane);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	941
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	942 /* 2D mode */
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	943 if (xstate == AXE_HORZ_DIR && ystate == AXE_VERT_DIR)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	944 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	945 if (props.xaxislocation_is ("top"))
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	946 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	947 double tmp = yPlane;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	948 yPlane = yPlaneN;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	949 yPlaneN = tmp;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	950 x2Dtop = true;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	951 }
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	952 ypTick = yPlaneN;
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	953 ypTickN = yPlane;
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	954 if (props.yaxislocation_is ("right"))
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	955 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	956 double tmp = xPlane;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	957 xPlane = xPlaneN;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	958 xPlaneN = tmp;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	959 y2Dright = true;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	960 }
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	961 xpTick = xPlaneN;
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	962 xpTickN = xPlane;
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	963 if (props.layer_is ("top"))
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	964 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	965 zpTick = zPlaneN;
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	966 layer2Dtop = true;
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	967 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	968 else
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	969 zpTick = zPlane;
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	970 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	971
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	972 Matrix view = props.get_view ().matrix_value ();
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	973 bool nearhoriz = std::abs(view(1)) <= 5;
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	974
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	975 Matrix axe_color = props.get_color_rgb ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	976 bool visible = props.is_visible ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	977 bool box = props.is_box ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	978
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	979 // Axes planes
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	980
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	981 if (axe_color.numel () > 0 && visible)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	982 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	983 set_color (axe_color);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	984 set_polygon_offset (true, 2.5);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	985
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	986 glBegin (GL_QUADS);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	987
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	988 // X plane
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	989 glVertex3d (xPlane, y_min, z_min);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	990 glVertex3d (xPlane, y_max, z_min);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	991 glVertex3d (xPlane, y_max, z_max);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	992 glVertex3d (xPlane, y_min, z_max);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	993
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	994 // Y plane
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	995 glVertex3d (x_min, yPlane, z_min);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	996 glVertex3d (x_max, yPlane, z_min);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	997 glVertex3d (x_max, yPlane, z_max);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	998 glVertex3d (x_min, yPlane, z_max);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	999
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1000 // Z plane
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	1001 glVertex3d (x_min, y_min, zPlane);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	1002 glVertex3d (x_max, y_min, zPlane);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	1003 glVertex3d (x_max, y_max, zPlane);
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	1004 glVertex3d (x_min, y_max, zPlane);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1005
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1006 glEnd ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1007
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1008 set_polygon_offset (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1009 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1010
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1011 // Axes box
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1012
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1013 set_linestyle ("-", true);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1014 set_linewidth (props.get_linewidth ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1015
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1016 if (visible)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1017 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1018 glBegin (GL_LINES);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1019
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1020 // X box
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1021 set_color (props.get_xcolor_rgb ());
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1022 glVertex3d (xPlaneN, ypTick, zpTick);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1023 glVertex3d (xPlane, ypTick, zpTick);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1024 if (box)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1025 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1026 glVertex3d (xPlaneN, ypTickN, zpTick);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1027 glVertex3d (xPlane, ypTickN, zpTick);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1028 glVertex3d (xPlaneN, ypTickN, zpTickN);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1029 glVertex3d (xPlane, ypTickN, zpTickN);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1030 glVertex3d (xPlaneN, ypTick, zpTickN);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1031 glVertex3d (xPlane, ypTick, zpTickN);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1032 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1033
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1034 // Y box
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1035 set_color (props.get_ycolor_rgb ());
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1036 glVertex3d (xpTick, yPlaneN, zpTick);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1037 glVertex3d (xpTick, yPlane, zpTick);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1038 if (box)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1039 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1040 glVertex3d (xpTickN, yPlaneN, zpTick);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1041 glVertex3d (xpTickN, yPlane, zpTick);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1042 glVertex3d (xpTickN, yPlaneN, zpTickN);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1043 glVertex3d (xpTickN, yPlane, zpTickN);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1044 glVertex3d (xpTick, yPlaneN, zpTickN);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1045 glVertex3d (xpTick, yPlane, zpTickN);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1046 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1047
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1048 // Z box
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1049 set_color (props.get_zcolor_rgb ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1050 if (xySym)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1051 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1052 glVertex3d (xPlaneN, yPlane, zPlaneN);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1053 glVertex3d (xPlaneN, yPlane, zPlane);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1054 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1055 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1056 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1057 glVertex3d (xPlane, yPlaneN, zPlaneN);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1058 glVertex3d (xPlane, yPlaneN, zPlane);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1059 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1060 if (box)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1061 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1062 glVertex3d (xPlane, yPlane, zPlaneN);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1063 glVertex3d (xPlane, yPlane, zPlane);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1064 if (xySym)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1065 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1066 glVertex3d (xPlane, yPlaneN, zPlaneN);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1067 glVertex3d (xPlane, yPlaneN, zPlane);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1068 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1069 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1070 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1071 glVertex3d (xPlaneN, yPlane, zPlaneN);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1072 glVertex3d (xPlaneN, yPlane, zPlane);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1073 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1074 glVertex3d (xPlaneN, yPlaneN, zPlaneN);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1075 glVertex3d (xPlaneN, yPlaneN, zPlane);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1076 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1077
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1078 glEnd ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1079 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1080
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1081 std::string gridstyle = props.get_gridlinestyle ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1082 std::string minorgridstyle = props.get_minorgridlinestyle ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1083
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1084 set_font (props);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1085
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1086 // X grid
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1087
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1088 if (visible && xstate != AXE_DEPTH_DIR)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1089 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1090 bool do_xgrid = (props.is_xgrid () && (gridstyle != "none"));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1091 bool do_xminorgrid = (props.is_xminorgrid () && (minorgridstyle != "none"));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1092 bool do_xminortick = props.is_xminortick ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1093 Matrix xticks = xform.xscale (props.get_xtick ().matrix_value ());
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1094 Matrix xmticks = xform.xscale (props.get_xmtick ().matrix_value ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1095 string_vector xticklabels = props.get_xticklabel ().all_strings ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1096 int wmax = 0, hmax = 0;
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1097 bool tick_along_z = nearhoriz \|\| xisinf (fy);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1098
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1099 set_color (props.get_xcolor_rgb ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1100
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1101 // grid lines
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1102 if (do_xgrid)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1103 render_grid (gridstyle, xticks, x_min, x_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1104 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1105 0, (zstate != AXE_DEPTH_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1106
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1107 // tick marks
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1108 if (tick_along_z)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1109 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1110 render_tickmarks (xticks, x_min, x_max, ypTick, ypTick, zpTick, zpTickN,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1111 0., 0., signum(zpTick-zpTickN)fzxticklen*tickdir,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1112 0, (box && xstate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1113 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1114 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1115 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1116 render_tickmarks (xticks, x_min, x_max, ypTick, ypTickN, zpTick, zpTick,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1117 0., signum(ypTick-ypTickN)fyxticklen*tickdir, 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1118 0, (box && xstate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1119 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1120
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1121 // tick texts
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1122 if (xticklabels.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1123 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1124 int halign = (xstate == AXE_HORZ_DIR ? 1 : (xyzSym ? 0 : 2));
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1125 int valign = (xstate == AXE_VERT_DIR ? 1 : (x2Dtop ? 0 : 2));
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1126
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1127 if (tick_along_z)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1128 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1129 render_ticktexts (xticks, xticklabels, x_min, x_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1130 ypTick, zpTick+signum(zpTick-zpTickN)fzxtickoffset,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1131 0, halign, valign, wmax, hmax);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1132 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1133 else
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1134 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1135 render_ticktexts (xticks, xticklabels, x_min, x_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1136 ypTick+signum(ypTick-ypTickN)fyxtickoffset, zpTick,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1137 0, halign, valign, wmax, hmax);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1138 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1139 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1140
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1141 // minor grid lines
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1142 if (do_xminorgrid)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1143 render_grid (minorgridstyle, xmticks, x_min, x_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1144 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1145 0, (zstate != AXE_DEPTH_DIR));
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	1146
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1147 // minor tick marks
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1148 if (do_xminortick)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1149 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1150 if (tick_along_z)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1151 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1152 render_tickmarks (xmticks, x_min, x_max, ypTick, ypTick, zpTick, zpTickN,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1153 0., 0., signum(zpTick-zpTickN)fzxticklen/2*tickdir,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1154 0, (box && xstate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1155 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1156 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1157 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1158 render_tickmarks (xmticks, x_min, x_max, ypTick, ypTickN, zpTick, zpTick,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1159 0., signum(ypTick-ypTickN)fyxticklen/2*tickdir, 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1160 0, (box && xstate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1161 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1162 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1163
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1164 text::properties& xlabel_props =
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1165 reinterpret_cast<text::properties&> (gh_manager::get_object (props.get_xlabel ()).get_properties ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1166
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1167 xlabel_props.set_visible ("on");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1168
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1169 if (! xlabel_props.get_string ().empty ())
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1170 {
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1171 if (xlabel_props.horizontalalignmentmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1172 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1173 xlabel_props.set_horizontalalignment (xstate > AXE_DEPTH_DIR ? "center" : (xyzSym ? "left" : "right"));
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1174 xlabel_props.set_horizontalalignmentmode("auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1175 }
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1176 if (xlabel_props.verticalalignmentmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1177 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1178 xlabel_props.set_verticalalignment (xstate == AXE_VERT_DIR \|\| x2Dtop ? "bottom" : "top");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1179 xlabel_props.set_verticalalignmentmode("auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1180 }
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1181
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1182 if (xlabel_props.positionmode_is("auto") \|\| xlabel_props.rotationmode_is("auto"))
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1183 {
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1184 double angle = 0;
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1185 ColumnVector p = graphics_xform::xform_vector ((x_min+x_max)/2, ypTick, zpTick);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1186
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1187 if (tick_along_z)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1188 p(2) += (signum(zpTick-zpTickN)fzxtickoffset);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1189 else
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1190 p(1) += (signum(ypTick-ypTickN)fyxtickoffset);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1191 p = xform.transform (p(0), p(1), p(2), false);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1192 switch (xstate)
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1193 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1194 case AXE_ANY_DIR:
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1195 p(0) += (xyzSym ? wmax : -wmax);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1196 p(1) += hmax;
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1197 break;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1198 case AXE_VERT_DIR:
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1199 p(0) -= wmax;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1200 angle = 90;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1201 break;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1202 case AXE_HORZ_DIR:
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1203 p(1) += (x2Dtop ? -hmax : hmax);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1204 break;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1205 }
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1206 if (xlabel_props.positionmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1207 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1208 p = xform.untransform (p(0), p(1), p(2), true);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1209 xlabel_props.set_position (p.extract_n (0, 3).transpose ());
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1210 xlabel_props.set_positionmode ("auto");
11585 1473d0cf86d2 untabify source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1211 }
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1212 if (xlabel_props.rotationmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1213 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1214 xlabel_props.set_rotation (angle);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1215 xlabel_props.set_rotationmode ("auto");
11585 1473d0cf86d2 untabify source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1216 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1217 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1218 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1219 }
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1220 else
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1221 {
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1222 gh_manager::get_object (props.get_xlabel ()).set ("visible", "off");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1223 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1224
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1225 // Y grid
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1226
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1227 if (ystate != AXE_DEPTH_DIR && visible)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1228 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1229 bool do_ygrid = (props.is_ygrid () && (gridstyle != "none"));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1230 bool do_yminorgrid = (props.is_yminorgrid () && (minorgridstyle != "none"));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1231 bool do_yminortick = props.is_yminortick ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1232 Matrix yticks = xform.yscale (props.get_ytick ().matrix_value ());
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1233 Matrix ymticks = xform.yscale (props.get_ymtick ().matrix_value ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1234 string_vector yticklabels = props.get_yticklabel ().all_strings ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1235 int wmax = 0, hmax = 0;
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1236 bool tick_along_z = nearhoriz \|\| xisinf (fx);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1237
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1238 set_color (props.get_ycolor_rgb ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1239
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1240 // grid lines
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1241 if (do_ygrid)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1242 render_grid (gridstyle, yticks, y_min, y_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1243 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1244 1, (zstate != AXE_DEPTH_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1245
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1246 // tick marks
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1247 if (tick_along_z)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1248 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1249 render_tickmarks (yticks, y_min, y_max, xpTick, xpTick, zpTick, zpTickN,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1250 0., 0., signum(zpTick-zpTickN)fzyticklen*tickdir,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1251 1, (box && ystate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1252 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1253 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1254 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1255 render_tickmarks (yticks, y_min, y_max, xpTick, xpTickN, zpTick, zpTick,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1256 signum(xPlaneN-xPlane)fxyticklen*tickdir, 0., 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1257 1, (box && ystate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1258 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1259
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1260 // tick texts
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1261 if (yticklabels.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1262 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1263 int halign = (ystate == AXE_HORZ_DIR ? 1 : (!xyzSym \|\| y2Dright ? 0 : 2));
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1264 int valign = (ystate == AXE_VERT_DIR ? 1 : 2);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1265
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1266 if (tick_along_z)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1267 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1268 render_ticktexts (yticks, yticklabels, y_min, y_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1269 xpTick, zpTick+signum(zpTick-zpTickN)fzytickoffset,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1270 1, halign, valign, wmax, hmax);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1271 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1272 else
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1273 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1274 render_ticktexts (yticks, yticklabels, y_min, y_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1275 xpTick+signum(xpTick-xpTickN)fxytickoffset, zpTick,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1276 1, halign, valign, wmax, hmax);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1277 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1278 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1279
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1280 // minor grid lines
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1281 if (do_yminorgrid)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1282 render_grid (minorgridstyle, ymticks, y_min, y_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1283 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1284 1, (zstate != AXE_DEPTH_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1285
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1286 // minor tick marks
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1287 if (do_yminortick)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1288 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1289 if (tick_along_z)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1290 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1291 render_tickmarks (ymticks, y_min, y_max, xpTick, xpTick, zpTick, zpTickN,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1292 0., 0., signum(zpTick-zpTickN)fzyticklen/2*tickdir,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1293 1, (box && ystate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1294 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1295 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1296 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1297 render_tickmarks (ymticks, y_min, y_max, xpTick, xpTickN, zpTick, zpTick,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1298 signum(xpTick-xpTickN)fxyticklen/2*tickdir, 0., 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1299 1, (box && ystate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1300 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1301 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1302
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1303 text::properties& ylabel_props =
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1304 reinterpret_cast<text::properties&> (gh_manager::get_object (props.get_ylabel ()).get_properties ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1305
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1306 ylabel_props.set_visible ("on");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1307
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1308 if (! ylabel_props.get_string ().empty ())
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1309 {
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1310 if (ylabel_props.horizontalalignmentmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1311 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1312 ylabel_props.set_horizontalalignment (ystate > AXE_DEPTH_DIR ? "center" : (!xyzSym ? "left" : "right"));
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1313 ylabel_props.set_horizontalalignmentmode("auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1314 }
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1315 if (ylabel_props.verticalalignmentmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1316 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1317 ylabel_props.set_verticalalignment (ystate == AXE_VERT_DIR && !y2Dright ? "bottom" : "top");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1318 ylabel_props.set_verticalalignmentmode("auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1319 }
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1320
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1321 if (ylabel_props.positionmode_is("auto") \|\| ylabel_props.rotationmode_is("auto"))
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1322 {
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1323 double angle = 0;
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1324 ColumnVector p = graphics_xform::xform_vector (xpTick, (y_min+y_max)/2, zpTick);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1325
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1326 if (tick_along_z)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1327 p(2) += (signum(zpTick-zpTickN)fzytickoffset);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1328 else
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1329 p(0) += (signum(xpTick-xpTickN)fxytickoffset);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1330 p = xform.transform (p(0), p(1), p(2), false);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1331 switch (ystate)
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1332 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1333 case AXE_ANY_DIR:
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1334 p(0) += (!xyzSym ? wmax : -wmax);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1335 p(1) += hmax;
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1336 break;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1337 case AXE_VERT_DIR:
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1338 p(0) += (y2Dright ? wmax : -wmax);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1339 angle = 90;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1340 break;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1341 case AXE_HORZ_DIR:
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1342 p(1) += hmax;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1343 break;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1344 }
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1345 if (ylabel_props.positionmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1346 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1347 p = xform.untransform (p(0), p(1), p(2), true);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1348 ylabel_props.set_position (p.extract_n (0, 3).transpose ());
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1349 ylabel_props.set_positionmode ("auto");
11585 1473d0cf86d2 untabify source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1350 }
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1351 if (ylabel_props.rotationmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1352 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1353 ylabel_props.set_rotation (angle);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1354 ylabel_props.set_rotationmode ("auto");
11585 1473d0cf86d2 untabify source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1355 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1356 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1357 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1358 }
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1359 else
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1360 {
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1361 gh_manager::get_object (props.get_ylabel ()).set ("visible", "off");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1362 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1363
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1364 // Z Grid
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1365
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1366 if (zstate != AXE_DEPTH_DIR && visible)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1367 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1368 bool do_zgrid = (props.is_zgrid () && (gridstyle != "none"));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1369 bool do_zminorgrid = (props.is_zminorgrid () && (minorgridstyle != "none"));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1370 bool do_zminortick = props.is_zminortick ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1371 Matrix zticks = xform.zscale (props.get_ztick ().matrix_value ());
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1372 Matrix zmticks = xform.zscale (props.get_zmtick ().matrix_value ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1373 string_vector zticklabels = props.get_zticklabel ().all_strings ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1374 int wmax = 0, hmax = 0;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1375
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1376 set_color (props.get_zcolor_rgb ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1377
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1378 // grid lines
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1379 if (do_zgrid)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1380 render_grid (gridstyle, zticks, z_min, z_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1381 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1382
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1383 // tick marks
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1384 if (xySym)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1385 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1386 if (xisinf (fy))
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1387 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1388 render_tickmarks( zticks, z_min, z_max, xPlaneN, xPlane, yPlane, yPlane,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1389 signum(xPlaneN-xPlane)fxzticklen*tickdir, 0., 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1390 2, (box && zstate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1391 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1392 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1393 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1394 render_tickmarks (zticks, z_min, z_max, xPlaneN, xPlaneN, yPlane, yPlane,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1395 0., signum(yPlane-yPlaneN)fyzticklen*tickdir, 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1396 2, false);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1397 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1398 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1399 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1400 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1401 if (xisinf (fx))
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1402 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1403 render_tickmarks (zticks, z_min, z_max, xPlaneN, xPlane, yPlaneN, yPlane,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1404 0., signum(yPlaneN-yPlane)fyzticklen*tickdir, 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1405 2, (box && zstate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1406 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1407 else
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1408 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1409 render_tickmarks (zticks, z_min, z_max, xPlane, xPlane, yPlaneN, yPlane,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1410 signum(xPlane-xPlaneN)fxzticklen*tickdir, 0., 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1411 2, false);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1412 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1413 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1414
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1415 // FIXME: tick texts
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1416 if (zticklabels.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1417 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1418 int halign = 2;
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1419 int valign = (zstate == AXE_VERT_DIR ? 1 : (zSign ? 3 : 2));
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1420
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1421 if (xySym)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1422 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1423 if (xisinf (fy))
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1424 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1425 render_ticktexts (zticks, zticklabels, z_min, z_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1426 xPlaneN+signum(xPlaneN-xPlane)fxztickoffset, yPlane,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1427 2, halign, valign, wmax, hmax);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1428 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1429 else
11166 9cdf43d1fa16 gl-render.cc: Crop ticks, ticklabels, and gridlines for OpenGL backend. Ben Abbott <bpabbott@mac.com> parents: 11163 diff changeset	1430 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1431 render_ticktexts (zticks, zticklabels, z_min, z_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1432 xPlaneN, yPlane+signum(yPlane-yPlaneN)fyztickoffset,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1433 2, halign, valign, wmax, hmax);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1434 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1435 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1436 else
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1437 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1438 if (xisinf (fx))
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1439 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1440 render_ticktexts (zticks, zticklabels, z_min, z_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1441 xPlane, yPlaneN+signum(yPlaneN-yPlane)fyztickoffset,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1442 2, halign, valign, wmax, hmax);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1443 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1444 else
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1445 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1446 render_ticktexts (zticks, zticklabels, z_min, z_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1447 xPlane+signum(xPlane-xPlaneN)fxztickoffset, yPlaneN,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1448 2, halign, valign, wmax, hmax);
11166 9cdf43d1fa16 gl-render.cc: Crop ticks, ticklabels, and gridlines for OpenGL backend. Ben Abbott <bpabbott@mac.com> parents: 11163 diff changeset	1449 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1450 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1451 }
7825 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 // minor grid lines
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1454 if (do_zminorgrid)
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1455 render_grid (minorgridstyle, zmticks, z_min, z_max,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1456 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1457
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1458 // minor tick marks
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1459 if (do_zminortick)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1460 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1461 if (xySym)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1462 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1463 if (xisinf (fy))
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1464 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1465 render_tickmarks( zmticks, z_min, z_max, xPlaneN, xPlane, yPlane, yPlane,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1466 signum(xPlaneN-xPlane)fxzticklen/2*tickdir, 0., 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1467 2, (box && zstate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1468 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1469 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1470 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1471 render_tickmarks (zmticks, z_min, z_max, xPlaneN, xPlaneN, yPlane, yPlane,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1472 0., signum(yPlane-yPlaneN)fyzticklen/2*tickdir, 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1473 2, false);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1474 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1475 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1476 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1477 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1478 if (xisinf (fx))
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1479 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1480 render_tickmarks (zmticks, z_min, z_max, xPlane, xPlane, yPlaneN, yPlane,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1481 0., signum(yPlaneN-yPlane)fyzticklen/2*tickdir, 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1482 2, (box && zstate != AXE_ANY_DIR));
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1483 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1484 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1485 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1486 render_tickmarks (zmticks, z_min, z_max, xPlane, xPlane, yPlaneN, yPlaneN,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1487 signum(xPlane-xPlaneN)fxzticklen/2*tickdir, 0., 0.,
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1488 2, false);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1489 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1490 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1491 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1492
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1493 text::properties& zlabel_props =
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1494 reinterpret_cast<text::properties&> (gh_manager::get_object (props.get_zlabel ()).get_properties ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1495
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1496 zlabel_props.set_visible ("on");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1497
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1498 if (! zlabel_props.get_string ().empty ())
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1499 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1500 bool camAuto = props.cameraupvectormode_is ("auto");
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1501
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1502 if (zlabel_props.horizontalalignmentmode_is("auto"))
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1503 {
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1504 zlabel_props.set_horizontalalignment ((zstate > AXE_DEPTH_DIR \|\| camAuto) ? "center" : "right");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1505 zlabel_props.set_horizontalalignmentmode("auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1506 }
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1507 if (zlabel_props.verticalalignmentmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1508 {
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1509 zlabel_props.set_verticalalignment(zstate == AXE_VERT_DIR ? "bottom" : ((zSign \|\| camAuto) ? "bottom" : "top"));
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1510 zlabel_props.set_verticalalignmentmode("auto");
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1511 }
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1512
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1513 if (zlabel_props.positionmode_is("auto") \|\| zlabel_props.rotationmode_is("auto"))
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1514 {
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1515 double angle = 0;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1516 ColumnVector p;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1517
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1518 if (xySym)
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1519 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1520 p = graphics_xform::xform_vector (xPlaneN, yPlane, (z_min+z_max)/2);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1521 if (xisinf (fy))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1522 p(0) += (signum(xPlaneN-xPlane)fxztickoffset);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1523 else
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1524 p(1) += (signum(yPlane-yPlaneN)fyztickoffset);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1525 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1526 else
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1527 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1528 p = graphics_xform::xform_vector (xPlane, yPlaneN, (z_min+z_max)/2);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1529 if (xisinf (fx))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1530 p(1) += (signum(yPlaneN-yPlane)fyztickoffset);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1531 else
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1532 p(0) += (signum(xPlane-xPlaneN)fxztickoffset);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1533 }
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1534 p = xform.transform (p(0), p(1), p(2), false);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1535 switch (zstate)
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1536 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1537 case AXE_ANY_DIR:
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1538 if (camAuto)
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1539 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1540 p(0) -= wmax;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1541 angle = 90;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1542 }
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1543 /* FIXME: what's the correct offset?
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1544 p[0] += (!xySym ? wmax : -wmax);
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 12125 diff changeset	1545 p[1] += (zSign ? hmax : -hmax);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1546 */
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1547 break;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1548 case AXE_VERT_DIR:
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1549 p(0) -= wmax;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1550 angle = 90;
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1551 break;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1552 case AXE_HORZ_DIR:
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1553 p(1) += hmax;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1554 break;
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1555 }
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1556 if (zlabel_props.positionmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1557 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1558 p = xform.untransform (p(0), p(1), p(2), true);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1559 zlabel_props.set_position (p.extract_n (0, 3).transpose ());
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1560 zlabel_props.set_positionmode ("auto");
11585 1473d0cf86d2 untabify source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1561 }
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1562 if (zlabel_props.rotationmode_is("auto"))
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1563 {
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1564 zlabel_props.set_rotation (angle);
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1565 zlabel_props.set_rotationmode ("auto");
11585 1473d0cf86d2 untabify source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1566 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1567 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1568 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1569 }
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1570 else
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1571 {
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1572 gh_manager::get_object (props.get_zlabel ()).set ("visible", "off");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1573 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1574
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1575 set_linestyle ("-");
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1576
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1577 // Title
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1578
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1579 text::properties& title_props =
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1580 reinterpret_cast<text::properties&> (gh_manager::get_object (props.get_title ()).get_properties ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1581
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11266 diff changeset	1582 if (! title_props.get_string ().empty () && title_props.positionmode_is("auto"))
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1583 {
11484 cda6044447a0 Improve positioning of titles. Konstantinos Poulios <logari81@googlemail.com> parents: 11463 diff changeset	1584 ColumnVector p = xform.untransform (bbox(0)+bbox(2)/2, (bbox(1)-10),
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1585 (x_zlim(0)+x_zlim(1))/2, true);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1586 title_props.set_position (p.extract_n(0, 3).transpose ());
11463 ae96756561d0 fixing bug #32074 Konstantinos Poulios <logari81@googlemail.com> parents: 11455 diff changeset	1587 title_props.set_positionmode ("auto");
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1588 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1589
7874 e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7870 diff changeset	1590 set_clipbox (x_min, x_max, y_min, y_max, z_min, z_max);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1591
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1592 // Children
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1593
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	1594 if (antialias == GL_TRUE)
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	1595 glEnable (GL_LINE_SMOOTH);
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	1596
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	1597 Matrix children = props.get_all_children ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1598 std::list<graphics_object> obj_list;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1599 std::list<graphics_object>::iterator it;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1600
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1601 // 1st pass: draw light objects
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1602
11026 811d8f113423 reverse order in which child objects are processed in OpenGL renderer John W. Eaton <jwe@octave.org> parents: 10924 diff changeset	1603 // Start with the last element of the array of child objects to
811d8f113423 reverse order in which child objects are processed in OpenGL renderer John W. Eaton <jwe@octave.org> parents: 10924 diff changeset	1604 // display them in the oder they were added to the array.
811d8f113423 reverse order in which child objects are processed in OpenGL renderer John W. Eaton <jwe@octave.org> parents: 10924 diff changeset	1605
811d8f113423 reverse order in which child objects are processed in OpenGL renderer John W. Eaton <jwe@octave.org> parents: 10924 diff changeset	1606 for (octave_idx_type i = children.numel () - 1; i >= 0; i--)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1607 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1608 graphics_object go = gh_manager::get_object (children (i));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1609
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1610 if (go.get_properties ().is_visible ())
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1611 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1612 if (go.isa ("light"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1613 draw (go);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1614 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1615 obj_list.push_back (go);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1616 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1617 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1618
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1619 // 2nd pass: draw other objects (with units set to "data")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1620
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1621 it = obj_list.begin ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1622 while (it != obj_list.end ())
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1623 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1624 graphics_object go = (*it);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1625
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1626 // FIXME: check whether object has "units" property and it is set to "data"
9616 2093499ec9f4 avoid crash if default font can't be found John W. Eaton <jwe@octave.org> parents: 9406 diff changeset	1627 if (! go.isa ("text") \|\| go.get ("units").string_value () == "data")
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1628 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1629 set_clipping (go.get_properties ().is_clipping ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1630 draw (go);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1631
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1632 it = obj_list.erase (it);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1633 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1634 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1635 it++;
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1636 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1637
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1638 // 3rd pass: draw remaining objects
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1639
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10350 diff changeset	1640 glDisable (GL_DEPTH_TEST);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1641 for (it = obj_list.begin (); it != obj_list.end (); it++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1642 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1643 graphics_object go = (*it);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1644
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1645 set_clipping (go.get_properties ().is_clipping ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1646 draw (go);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1647 }
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10350 diff changeset	1648 glEnable (GL_DEPTH_TEST);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1649
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1650 set_clipping (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1651 // FIXME: finalize rendering (transparency processing)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1652 // FIXME: draw zoom box, if needed
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1653 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1654
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1655 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	1656 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	1657 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1658 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	1659 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	1660 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	1661
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1662 bool has_z = (z.numel () > 0);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1663 int n = static_cast<int> (::xmin (::xmin (x.numel (), y.numel ()), (has_z ? z.numel () : INT_MAX)));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1664 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	1665
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1666 std::vector<octave_uint8> clip (n);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1667
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1668 if (has_z)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1669 for (int i = 0; i < n; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1670 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	1671 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1672 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1673 double z_mid = (zmin+zmax)/2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1674
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1675 for (int i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1676 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	1677 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1678
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1679 if (! props.linestyle_is ("none"))
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1680 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1681 set_color (props.get_color_rgb ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1682 set_linestyle (props.get_linestyle (), false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1683 set_linewidth (props.get_linewidth ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1684
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1685 if (has_z)
10315 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 bool flag = false;
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 for (int i = 1; i < n; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1690 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1691 if ((clip[i-1] & clip[i]) == clip_ok)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1692 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1693 if (! flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1694 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1695 flag = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1696 glBegin (GL_LINE_STRIP);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1697 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	1698 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1699 glVertex3d (x(i), y(i), z(i));
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 else if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1702 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1703 flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1704 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1705 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1706 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1707
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1708 if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1709 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1710 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1711 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1712 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1713 bool flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1714
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1715 for (int i = 1; i < n; i++)
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 if ((clip[i-1] & clip[i]) == clip_ok)
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 if (! flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1720 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1721 flag = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1722 glBegin (GL_LINE_STRIP);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1723 glVertex2d (x(i-1), y(i-1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1724 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1725 glVertex2d (x(i), y(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1726 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1727 else if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1728 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1729 flag = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1730 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1731 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1732 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1733
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1734 if (flag)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1735 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1736 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1737
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1738 set_linewidth (0.5);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1739 set_linestyle ("-");
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1740 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1741
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1742 set_clipping (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1743
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1744 if (! props.marker_is ("none") &&
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1745 ! (props.markeredgecolor_is ("none")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1746 && props.markerfacecolor_is ("none")))
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1747 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1748 Matrix lc, fc;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1749
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1750 if (props.markeredgecolor_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1751 lc = props.get_color_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1752 else if (! props.markeredgecolor_is ("none"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1753 lc = props.get_markeredgecolor_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1754
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1755 if (props.markerfacecolor_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1756 fc = props.get_color_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1757 else if (! props.markerfacecolor_is ("none"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1758 fc = props.get_markerfacecolor_rgb ();
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1759
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1760 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	1761 props.get_linewidth ());
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1762
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1763 for (int i = 0; i < n; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1764 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1765 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	1766 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	1767 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	1768 lc, fc);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1769 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1770
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1771 end_marker ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1772 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1773
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1774 set_clipping (props.is_clipping ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1775 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1776
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1777 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	1778 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	1779 {
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	1780 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	1781 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	1782 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	1783
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1784 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	1785
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1786 NDArray c;
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	1787 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	1788
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1789 // FIXME: handle transparency
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1790 Matrix a;
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1791
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1792 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	1793 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	1794
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1795 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	1796 (props.facecolor_is ("flat") ? 1 :
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1797 (props.facecolor_is ("interp") ? 2 :
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1798 (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	1799 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	1800 (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	1801 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	1802 (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	1803 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	1804 (props.edgecolor_is ("flat") ? 1 :
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1805 (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	1806 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	1807 (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	1808 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	1809 (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	1810
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1811 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	1812 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	1813
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1814 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	1815 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	1816 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	1817 float se = props.get_specularexponent ();
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1818 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	1819 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	1820
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1821 opengl_texture tex;
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 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 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	1824 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	1825 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	1826
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1827 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	1828
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1829 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	1830
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1831 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	1832 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1833 if (x_mat)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1834 i1 = i;
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1835
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1836 for (int j = 0; j < zc; j++)
10315 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 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1839 j1 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1840
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1841 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	1842 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1843 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1844
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1845 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	1846 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	1847
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1848 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	1849 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1850 // FIXME: implement alphadata conversion
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1851 //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	1852 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1853
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1854 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	1855 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1856 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	1857
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1858 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	1859 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	1860 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1861
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1862 // 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	1863 // 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	1864 if (fc_mode == 3)
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	1865 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	1866
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	1867 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	1868 {
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	1869 if (props.get_facealpha_double () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1870 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1871 if (fc_mode == 0 \|\| fc_mode == 3)
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 glColor3dv (fcolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1874 if (fl_mode > 0)
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 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1877 cb[i] = as * fcolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1878 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1879
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1880 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1881 cb[i] = ds * fcolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1882 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1883 }
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1886 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1887 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1888 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	1889 set_polygon_offset (true, 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1890 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1891 glEnable (GL_TEXTURE_2D);
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 for (int i = 1; i < zc; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1894 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1895 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1896 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1897 i1 = i-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1898 i2 = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1899 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1900
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1901 for (int j = 1; j < zr; j++)
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 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	1904 \|\| clip (j-1, i) \|\| clip (j, i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1905 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1906
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1907 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1908 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1909 j1 = j-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1910 j2 = j;
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1913 glBegin (GL_QUADS);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1914
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1915 // Vertex 1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1916 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1917 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	1918 else if (fc_mode > 0)
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 // 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	1921 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1922 cb[k] = c(j-1, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1923 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1924
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1925 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1926 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1927 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1928 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1929 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1930
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1931 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1932 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	1933 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 }
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1936 if (fl_mode > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1937 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1938 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	1939 + 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	1940 + 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	1941 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	1942 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1943 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	1944
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1945 // Vertex 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1946 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1947 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	1948 else if (fc_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1949 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1950 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1951 cb[k] = c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1952 glColor3fv (cb);
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 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1955 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1956 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1957 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1958 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1959
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1960 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1961 cb[k] = ds * c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1962 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1963 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1964 }
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1965
0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1966 if (fl_mode == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1967 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1968 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	1969 + 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	1970 + 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	1971 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	1972 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1973
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1974 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	1975
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1976 // Vertex 3
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1977 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1978 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	1979 else if (fc_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1980 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1981 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1982 cb[k] = c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1983 glColor3fv (cb);
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 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1986 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1987 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1988 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1989 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1990
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1991 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1992 cb[k] = ds * c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1993 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1994 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1995 }
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	1996 if (fl_mode == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1997 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	1998 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	1999 + n(j,i,1) * n(j,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2000 + n(j,i,2) * n(j,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2001 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	2002 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2003 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	2004
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2005 // Vertex 4
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2006 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2007 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	2008 else if (fc_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2009 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2010 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2011 cb[k] = c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2012 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2013
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2014 if (fl_mode > 0)
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 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2017 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2018 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2019
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2020 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2021 cb[k] = ds * c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2022 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2023 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2024 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2025 if (fl_mode == 2)
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 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	2028 + 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	2029 + 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	2030 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	2031 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2032 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	2033
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2034 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2035 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2036 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2037
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2038 set_polygon_offset (false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2039 if (fc_mode == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2040 glDisable (GL_TEXTURE_2D);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2041
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2042 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2043 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2044 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2045 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2046 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2047 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2048 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2049 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2050
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2051 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	2052 {
7846 d7737a4268b7 Fix typos in property names (edgealpha/facealpha). Michael Goffioul <michael.goffioul@gmail.com> parents: 7838 diff changeset	2053 if (props.get_edgealpha_double () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2054 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2055 if (ec_mode == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2056 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2057 glColor3dv (ecolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2058 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2059 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2060 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2061 cb[i] = as * ecolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2062 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2063
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2064 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2065 cb[i] = ds * ecolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2066 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2067 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2068 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2069
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2070 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2071 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2072 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	2073
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2074 set_linestyle (props.get_linestyle (), false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2075 set_linewidth (props.get_linewidth ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2076
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2077 // Mesh along Y-axis
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2078
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2079 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	2080 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2081 for (int i = 0; i < zc; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2082 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2083 if (y_mat)
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 i1 = i-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2086 i2 = i;
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2089 for (int j = 1; j < zr; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2090 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2091 if (clip(j-1,i) \|\| clip(j,i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2092 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2093
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2094 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2095 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2096 j1 = j-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2097 j2 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2098 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2099
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2100 glBegin (GL_LINES);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2101
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2102 // Vertex 1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2103 if (ec_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2104 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2105 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2106 cb[k] = c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2107 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2108
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2109 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2110 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2111 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2112 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2113 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2114
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2115 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2116 cb[k] = ds * c(j-1, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2117 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2118 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2119 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2120 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2121 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2122 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	2123 + 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	2124 + 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	2125 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	2126 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2127 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	2128
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2129 // Vertex 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2130 if (ec_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2131 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2132 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2133 cb[k] = c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2134 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2135
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2136 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2137 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2138 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2139 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2140 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2141
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2142 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2143 cb[k] = ds * c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2144 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2145 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2146 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2147 if (el_mode == 2)
8674 0d263850d582 Fix calculation of diffuse reflectance. Calculate surface normals here now. Kai Habel parents: 8377 diff changeset	2148 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2149 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	2150 + n(j,i,1) * n(j,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2151 + n(j,i,2) * n(j,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2152 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	2153 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2154 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	2155
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2156 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2157 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2158 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2159 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2160
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2161 // Mesh along X-axis
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2162
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2163 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	2164 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2165 for (int j = 0; j < zr; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2166 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2167 if (x_mat)
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 j1 = j-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2170 j2 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2171 }
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 for (int i = 1; i < zc; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2174 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2175 if (clip(j,i-1) \|\| clip(j,i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2176 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2177
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2178 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2179 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2180 i1 = i-1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2181 i2 = i;
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2184 glBegin (GL_LINES);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2185
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2186 // Vertex 1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2187 if (ec_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2188 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2189 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2190 cb[k] = c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2191 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2192
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2193 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2194 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2195 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2196 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2197 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2198
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2199 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2200 cb[k] = ds * c(j, i-1, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2201 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2202 }
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 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2205 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2206 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	2207 + 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	2208 + 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	2209 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	2210 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2211 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	2212
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2213 // Vertex 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2214 if (ec_mode == 2)
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 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2217 cb[k] = c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2218 glColor3fv (cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2219
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2220 if (fl_mode > 0)
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 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2223 cb[k] *= as;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2224 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2225
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2226 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2227 cb[k] = ds * c(j, i, k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2228 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2231 if (el_mode == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2232 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2233 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	2234 + n(j,i,1) * n(j,i,1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2235 + n(j,i,2) * n(j,i,2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2236 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	2237 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2238 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	2239
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2240 glEnd ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2241 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2242 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2243 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2244
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2245 set_linestyle ("-");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2246 set_linewidth (0.5);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2247
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2248 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2249 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2250 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2251 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2252 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2253 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2254 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2255 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2256
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2257 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	2258 ! (props.markeredgecolor_is ("none")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2259 && 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	2260 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2261 // 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	2262 // 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	2263 // 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	2264
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2265 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	2266 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	2267
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2268 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	2269 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	2270 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	2271
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2272 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	2273 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2274 mecolor = props.get_edgecolor_rgb ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2275 do_edge = ! props.edgecolor_is ("none");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2276 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2277
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2278 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	2279 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2280 mfcolor = props.get_facecolor_rgb ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2281 do_face = ! props.facecolor_is ("none");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2282 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2283
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2284 if ((mecolor.numel () == 0 \|\| mfcolor.numel () == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2285 && c.numel () == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2286 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	2287
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2288 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	2289 props.get_linewidth ());
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2290
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2291 for (int i = 0; i < zc; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2292 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2293 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2294 i1 = i;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2295
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2296 for (int j = 0; j < zr; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2297 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2298 if (clip(j,i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2299 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2300
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2301 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2302 j1 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2303
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2304 if ((do_edge && mecolor.numel () == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2305 \|\| (do_face && mfcolor.numel () == 0))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2306 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2307 for (int k = 0; k < 3; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2308 cc(k) = c(j,i,k);
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2311 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	2312 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	2313
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2314 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	2315 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2316 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2317
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2318 end_marker ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2319 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2320 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2321
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	2322 // 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	2323 // 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	2324 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2325 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	2326 {
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2327 const Matrix f = props.get_faces ().matrix_value ();
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2328 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	2329 Matrix c;
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2330 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	2331 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	2332
7870 b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2333 int nv = v.rows ();
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2334 // int vmax = v.columns ();
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2335 int nf = f.rows ();
b1823dfd6ec7 style fixes John W. Eaton <jwe@octave.org> parents: 7866 diff changeset	2336 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	2337
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2338 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	2339 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	2340 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	2341
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2342 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	2343 \|\| props.facecolor_is_rgb ()) ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2344 (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	2345 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	2346 (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	2347 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	2348 (props.facealpha_is ("flat") ? 1 : 2));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2349 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	2350 \|\| props.edgecolor_is_rgb ()) ? 0 :
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2351 (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	2352 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	2353 (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	2354 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	2355 (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	2356
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2357 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	2358 Matrix ecolor = props.get_edgecolor_rgb ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2359
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	2360 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	2361 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	2362 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	2363 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	2364
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2365 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	2366
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2367 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	2368 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	2369 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	2370 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	2371 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	2372 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	2373
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2374 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	2375 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	2376
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2377 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	2378 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2379 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	2380 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	2381
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2382 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	2383 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	2384
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2385 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	2386 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	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 (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	2390 {
8ff92634982d Add initial 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 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	2392
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2393 if (c.rows () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2394 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2395 // 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	2396
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2397 if (fc_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2398 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2399 fcolor = c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2400 fc_mode = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2401 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2402
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2403 if (ec_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2404 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2405 ecolor = c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2406 ec_mode = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2407 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2408
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2409 c = Matrix ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2410 }
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	2411 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2412 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	2413 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2414
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2415 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	2416 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2417 // 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	2418 //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	2419 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	2420 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2421
7924 4976f66d469b miscellaneous cleanup John W. Eaton <jwe@octave.org> parents: 7914 diff changeset	2422 octave_idx_type fr = f.rows ();
7914 e998e81224b5 Various compilation fixes for MSVC. John W. Eaton <jwe@octave.org> parents: 7907 diff changeset	2423 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	2424
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2425 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	2426 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	2427 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2428 int idx = int (f(i,j) - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2429
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2430 Matrix vv (1, 3, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2431 Matrix cc;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2432 Matrix nn(1, 3, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2433 double aa = 1.0;
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 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	2436 if (has_z)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2437 vv(2) = v(idx,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2438 // FIXME: uncomment when patch object has normal computation
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2439 //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	2440 if (c.numel () > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2441 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2442 cc.resize (1, 3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2443 if (has_facecolor)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2444 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	2445 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2446 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	2447 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2448 if (a.numel () > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2449 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2450 if (has_facealpha)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2451 aa = a(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2452 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2453 aa = a(idx);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2454 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2455
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2456 vdata[i+j*fr] =
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2457 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	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
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2460 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	2461 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2462 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	2463
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2464 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	2465 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	2466 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2467
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2468 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	2469 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2470 // 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	2471 if (props.get_facealpha_double () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2472 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2473 if (fc_mode == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2474 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2475 glColor3dv (fcolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2476 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2477 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2478 float cb[4] = { 0, 0, 0, 1 };
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2479
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2480 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2481 cb[i] = (as * fcolor(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2482 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2483
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2484 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2485 cb[i] = ds * fcolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2486 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2487 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2488 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2489
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2490 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2491 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2492
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2493 // FIXME: use __index__ property from patch object
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2494 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	2495
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2496 for (int i = 0; i < nf; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2497 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2498 if (clip_f(i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2499 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2500
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2501 tess.begin_polygon (true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2502 tess.begin_contour ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2503
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2504 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	2505 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2506 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	2507
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2508 tess.add_vertex (vv->coords.fortran_vec (), vv);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2509 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2510
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2511 tess.end_contour ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2512 tess.end_polygon ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2513 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2514
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2515 if (fl_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2516 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2517 }
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	2518 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2519 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2520 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2521 }
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	2522 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2523
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2524 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	2525 {
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2526 // 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	2527 if (props.get_edgealpha_double () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2528 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2529 if (ec_mode == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2530 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2531 glColor3dv (ecolor.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2532 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2533 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2534 float cb[4] = { 0, 0, 0, 1 };
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2535
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2536 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2537 cb[i] = (as * ecolor(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2538 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2539
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2540 for (int i = 0; i < 3; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2541 cb[i] = ds * ecolor(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2542 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2543 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2544 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2545
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2546 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2547 glEnable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2548
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2549 set_linestyle (props.get_linestyle (), false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2550 set_linewidth (props.get_linewidth ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2551
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2552
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2553 // 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	2554 // offset patch contour as well?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2555 patch_tesselator tess (this, ec_mode, el_mode);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2556
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2557 for (int i = 0; i < nf; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2558 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2559 if (clip_f(i))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2560 {
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2561 // 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	2562 bool flag = false;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2563
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2564 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	2565 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2566 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	2567 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2568 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	2569 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	2570 if (! flag)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2571 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2572 flag = true;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2573 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	2574 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2575 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	2576 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2577 else if (flag)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2578 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2579 flag = false;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2580 glEnd ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2581 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2582 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2583
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2584 if (flag)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2585 glEnd ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2586 }
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2587 else
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2588 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2589 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	2590 tess.begin_contour ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2591
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2592 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	2593 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2594 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	2595 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	2596 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2597
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2598 tess.end_contour ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2599 tess.end_polygon ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2600 }
10315 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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2603 set_linestyle ("-");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2604 set_linewidth (0.5);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2605
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2606 if (el_mode > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2607 glDisable (GL_LIGHTING);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2608 }
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	2609 else
10315 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 // FIXME: implement transparency
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2612 }
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	2613 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2614
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2615 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	2616 ! (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	2617 {
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2618 bool do_edge = ! props.markeredgecolor_is ("none");
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2619 bool do_face = ! props.markerfacecolor_is ("none");
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2620
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2621 Matrix mecolor = props.get_markeredgecolor_rgb ();
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2622 Matrix mfcolor = props.get_markerfacecolor_rgb ();
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2623 Matrix cc (1, 3, 0.0);
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2624
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2625 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	2626 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2627 mecolor = props.get_edgecolor_rgb ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2628 do_edge = ! props.edgecolor_is ("none");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2629 }
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2630
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2631 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	2632 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2633 mfcolor = props.get_facecolor_rgb ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2634 do_face = ! props.facecolor_is ("none");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2635 }
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2636
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2637 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	2638 props.get_linewidth ());
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2639
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2640 for (int i = 0; i < nf; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2641 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	2642 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2643 int idx = int (f(i,j) - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2644
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2645 if (clip(idx))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2646 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2647
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2648 Matrix lc = (do_edge ? (mecolor.numel () == 0 ?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2649 vdata[i+j*fr].get_rep ()->color : mecolor)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2650 : Matrix ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2651 Matrix fc = (do_face ? (mfcolor.numel () == 0 ?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2652 vdata[i+j*fr].get_rep ()->color : mfcolor)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2653 : Matrix ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2654
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2655 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	2656 }
7838 0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2657
0a2ba0053fbd Render marker of patch objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 7837 diff changeset	2658 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	2659 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2660 }
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	2661
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	2662 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2663 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	2664 {
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2665 draw (props.get_children ());
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2666 }
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2667
35e8d6199455 Add hggroup support in OpenGL renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7851 diff changeset	2668 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2669 opengl_renderer::draw_text (const text::properties& props)
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2670 {
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2671 if (props.get_string ().empty ())
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2672 return;
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2673
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2674 set_font (props);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2675 set_color (props.get_color_rgb ());
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2676
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10350 diff changeset	2677 const Matrix pos = xform.scale (props.get_data_position ());
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2678 const Matrix bbox = props.get_extent_matrix ();
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2679
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2680 // FIXME: handle margin and surrounding box
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2681 bool blend = glIsEnabled (GL_BLEND);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2682
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2683 glEnable (GL_BLEND);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2684 glEnable (GL_ALPHA_TEST);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2685 glRasterPos3d (pos(0), pos(1), pos(2));
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2686 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	2687 glDrawPixels (bbox(2), bbox(3),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2688 GL_RGBA, GL_UNSIGNED_BYTE, props.get_pixels ().data ());
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2689 glDisable (GL_ALPHA_TEST);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2690 if (! blend)
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2691 glDisable (GL_BLEND);
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2692
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2693 }
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2694
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2695 void
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	2696 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	2697 {
9884 fed4aad2cdca handle indexed images in opengl renderer Shai Ayal <shaiay@users.sourceforge.net> parents: 9834 diff changeset	2698 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	2699 dim_vector dv (cdata.dims ());
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2700 int h = dv(0), w = dv(1);
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2701 bool ok = true;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2702
11093 d748acc75658 gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab. Ben Abbott <bpabbott@mac.com> parents: 11026 diff changeset	2703 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	2704 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	2705
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2706 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	2707 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	2708
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2709 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	2710 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	2711
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	2712 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	2713 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	2714
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2715 // image pixel size in screen pixel units
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2716 float pix_dx, pix_dy;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2717 // image pixel size in normalized units
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2718 float nor_dx, nor_dy;
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2719
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2720 if (w > 1)
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2721 {
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2722 pix_dx = (p1(0) - p0(0))/(w-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2723 nor_dx = (x(1) - x(0))/(w-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2724 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2725 else
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2726 {
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2727 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	2728 pix_dx = p1w(0) - p0(0);
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2729 nor_dx = 1;
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2730 }
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2731
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2732 if (h > 1)
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2733 {
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2734 pix_dy = (p1(1) - p0(1))/(h-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2735 nor_dy = (y(1) - y(0))/(h-1);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2736 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2737 else
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2738 {
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 9950 diff changeset	2739 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	2740 pix_dy = p1h(1) - p0(1);
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2741 nor_dy = 1;
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2742 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2743
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2744
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2745 // 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	2746 // 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	2747 // ourselfes - only draw part of the image
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2748
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2749 int j0 = 0, j1 = w;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2750 int i0 = 0, i1 = h;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2751
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2752 float im_xmin = x(0) - nor_dx/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2753 float im_xmax = x(1) + nor_dx/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2754 float im_ymin = y(0) - nor_dy/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2755 float im_ymax = y(1) + nor_dy/2;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2756 if (props.is_clipping ()) // clip to axes
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2757 {
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2758 if (im_xmin < xmin)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2759 j0 += (xmin - im_xmin)/nor_dx + 1;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2760 if (im_xmax > xmax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2761 j1 -= (im_xmax - xmax)/nor_dx ;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2762
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2763 if (im_ymin < ymin)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2764 i0 += (ymin - im_ymin)/nor_dy + 1;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2765 if (im_ymax > ymax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2766 i1 -= (im_ymax - ymax)/nor_dy;
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2767 }
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2768 else // clip to viewport
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2769 {
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2770 GLfloat vp[4];
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2771 glGetFloatv(GL_VIEWPORT, vp);
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2772 // 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	2773
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2774 }
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2775
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2776 if (i0 >= i1 \|\| j0 >= j1)
9687 86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2777 return;
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2778
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2779 glPixelZoom (pix_dx, -pix_dy);
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2780 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	2781
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2782 // by default this is 4
86aa08bbc887 image clipping and axes fixes Shai Ayal <shaiay@users.sourceforge.net> parents: 9682 diff changeset	2783 glPixelStorei (GL_UNPACK_ALIGNMENT,1);
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2784
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2785 // Expect RGB data
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2786 if (dv.length () == 3 && dv(2) == 3)
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2787 {
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2788 if (cdata.is_double_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2789 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2790 const NDArray xcdata = cdata.array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2791
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2792 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	2793
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2794 for (int i = i0; i < i1; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2795 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2796 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	2797 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2798 a[idx] = xcdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2799 a[idx+1] = xcdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2800 a[idx+2] = xcdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2801 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2802 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2803
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2804 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	2805
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2806 }
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2807 else if (cdata.is_uint16_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2808 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2809 const uint16NDArray xcdata = cdata.uint16_array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2810
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2811 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	2812
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2813 for (int i = i0; i < i1; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2814 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2815 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	2816 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2817 a[idx] = xcdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2818 a[idx+1] = xcdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2819 a[idx+2] = xcdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2820 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2821 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2822
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2823 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	2824
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2825 }
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2826 else if (cdata.is_uint8_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2827 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2828 const uint8NDArray xcdata = cdata.uint8_array_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2829
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2830 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	2831
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2832 for (int i = i0; i < i1; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2833 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2834 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	2835 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2836 a[idx] = xcdata(i,j,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2837 a[idx+1] = xcdata(i,j,1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2838 a[idx+2] = xcdata(i,j,2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2839 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2840 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2841
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2842 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	2843 }
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2844 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2845 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2846 ok = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2847 warning ("opengl_texture::draw: invalid image data type (expected double, uint16, or uint8)");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2848 }
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2849 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2850 else
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2851 {
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2852 ok = false;
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2853 warning ("opengl_texture::draw: invalid image size (expected nm3 or n*m)");
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2854 }
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2855 glPixelZoom (1, 1);
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2856 }
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2857
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9616 diff changeset	2858 void
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2859 opengl_renderer::set_viewport (int w, int h)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2860 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2861 glViewport (0, 0, w, h);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2862 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2863
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2864 void
9950 7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2865 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	2866 GLenum type, const GLvoid *data)
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2867 {
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2868 glDrawPixels (width, height, format, type, data);
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2869 }
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2870
7dedfd70dd9f image printing for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9884 diff changeset	2871 void
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2872 opengl_renderer::set_color (const Matrix& c)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2873 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2874 glColor3dv (c.data ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2875 #if HAVE_FREETYPE
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2876 text_renderer.set_color (c);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2877 #endif
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2878 }
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2879
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2880 void
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2881 opengl_renderer::set_font (const base_properties& props)
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2882 {
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2883 #if HAVE_FREETYPE
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2884 text_renderer.set_font (props.get ("fontname").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2885 props.get ("fontweight").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2886 props.get ("fontangle").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	2887 props.get ("fontsize").double_value ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	2888 #endif
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2889 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2890
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2891 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2892 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	2893 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2894 if (on)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2895 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2896 glPolygonOffset (offset, offset);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2897 glEnable (GL_POLYGON_OFFSET_FILL);
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2898 glEnable (GL_POLYGON_OFFSET_LINE);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2899 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2900 else
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2901 {
b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2902 glDisable (GL_POLYGON_OFFSET_FILL);
b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2903 glDisable (GL_POLYGON_OFFSET_LINE);
b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	2904 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2905 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2906
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2907 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2908 opengl_renderer::set_linewidth (float w)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2909 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2910 glLineWidth (w);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2911 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2912
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2913 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2914 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	2915 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2916 bool solid = false;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2917
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2918 if (s == "-")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2919 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2920 glLineStipple (1, static_cast<unsigned short> (0xFFFF));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2921 solid = true;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2922 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2923 else if (s == ":")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2924 glLineStipple (1, static_cast<unsigned short> (0x8888));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2925 else if (s == "--")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2926 glLineStipple (1, static_cast<unsigned short> (0x0FFF));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2927 else if (s == "-.")
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2928 glLineStipple (1, static_cast<unsigned short> (0x020F));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2929 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2930 glLineStipple (1, static_cast<unsigned short> (0x0000));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2931
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2932 if (solid && ! use_stipple)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2933 glDisable (GL_LINE_STIPPLE);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2934 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2935 glEnable (GL_LINE_STIPPLE);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2936 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2937
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2938 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2939 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	2940 double z1, double z2)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2941 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2942 double dx = (x2-x1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2943 double dy = (y2-y1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2944 double dz = (z2-z1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2945
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2946 x1 -= 0.001dx; x2 += 0.001dx;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2947 y1 -= 0.001dy; y2 += 0.001dy;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2948 z1 -= 0.001dz; z2 += 0.001dz;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2949
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2950 ColumnVector p (4, 0.0);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2951
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2952 p(0) = -1; p(3) = x2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2953 glClipPlane (GL_CLIP_PLANE0, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2954 p(0) = 1; p(3) = -x1;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2955 glClipPlane (GL_CLIP_PLANE1, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2956 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	2957 glClipPlane (GL_CLIP_PLANE2, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2958 p(1) = 1; p(3) = -y1;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2959 glClipPlane (GL_CLIP_PLANE3, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2960 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	2961 glClipPlane (GL_CLIP_PLANE4, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2962 p(2) = 1; p(3) = -z1;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2963 glClipPlane (GL_CLIP_PLANE5, p.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2964
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2965 xmin = x1; xmax = x2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2966 ymin = y1; ymax = y2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2967 zmin = z1; zmax = z2;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2968 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2969
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2970 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2971 opengl_renderer::set_clipping (bool enable)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2972 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2973 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	2974
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2975 if (enable != has_clipping)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2976 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2977 if (enable)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2978 for (int i = 0; i < 6; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2979 glEnable (GL_CLIP_PLANE0+i);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2980 else
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2981 for (int i = 0; i < 6; i++)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2982 glDisable (GL_CLIP_PLANE0+i);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2983 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2984 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2985
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2986 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2987 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	2988 {
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	2989 #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	2990 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	2991 #else
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2992 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	2993 #endif
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2994
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2995 glGetIntegerv (GL_VIEWPORT, vw);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2996
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2997 glMatrixMode (GL_PROJECTION);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2998 glPushMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2999 glLoadIdentity ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3000 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	3001 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3002 glPushMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3003
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3004 set_clipping (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3005 set_linewidth (width);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3006
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3007 marker_id = make_marker_list (m, size, false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3008 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	3009 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3010
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3011 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3012 opengl_renderer::end_marker (void)
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3013 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3014 glDeleteLists (marker_id, 1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3015 glDeleteLists (filled_marker_id, 1);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3016
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3017 glMatrixMode (GL_MODELVIEW);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3018 glPopMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3019 glMatrixMode (GL_PROJECTION);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3020 glPopMatrix ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3021 set_linewidth (0.5f);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3022 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3023
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3024 void
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3025 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	3026 const Matrix& lc, const Matrix& fc)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3027 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3028 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	3029
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3030 glLoadIdentity ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3031 glTranslated (tmp(0), tmp(1), -tmp(2));
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3032
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	3033 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	3034 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3035 glColor3dv (fc.data ());
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	3036 set_polygon_offset (true, -1.0);
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3037 glCallList (filled_marker_id);
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	3038 if (lc.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3039 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3040 glColor3dv (lc.data ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3041 glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3042 glEdgeFlag (GL_TRUE);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3043 set_polygon_offset (true, -2.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3044 glCallList (filled_marker_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3045 glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3046 }
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3047 set_polygon_offset (false);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3048 }
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	3049 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	3050 {
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3051 glColor3dv (lc.data ());
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3052 glCallList (marker_id);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3053 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3054 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3055
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3056 unsigned int
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3057 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	3058 bool filled) const
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3059 {
7907 c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	3060 char c = marker[0];
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	3061
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	3062 if (filled && (c == '+' \|\| c == 'x' \|\| c == '*' \|\| c == '.'))
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	3063 return 0;
c350329da645 Implement basic line antialiasing John W. Eaton <jwe@octave.org> parents: 7906 diff changeset	3064
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3065 unsigned int ID = glGenLists (1);
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	3066 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	3067
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3068 // constants for the * marker
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3069 const double sqrt2d4 = 0.35355339059327;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3070 double tt = sz*sqrt2d4;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3071
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3072 glNewList (ID, GL_COMPILE);
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3073
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3074 switch (marker[0])
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3075 {
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3076 case '+':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3077 glBegin (GL_LINES);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3078 glVertex2f (-sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3079 glVertex2f (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3080 glVertex2f (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3081 glVertex2f (0, sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3082 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3083 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3084 case 'x':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3085 glBegin(GL_LINES);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3086 glVertex2f (-sz/2, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3087 glVertex2f (sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3088 glVertex2f (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3089 glVertex2f (sz/2, -sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3090 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3091 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3092 case '*':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3093 glBegin (GL_LINES);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3094 glVertex2f (-sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3095 glVertex2f (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3096 glVertex2f (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3097 glVertex2f (0, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3098 glVertex2f (-tt, -tt);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3099 glVertex2f (+tt, +tt);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3100 glVertex2f (-tt, +tt);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3101 glVertex2f (+tt, -tt);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3102 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3103 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3104 case '.':
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3105 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3106 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	3107
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3108 glBegin (GL_POLYGON);
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3109 for (double ang = 0; ang < (2*M_PI); ang += ang_step)
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3110 glVertex2d (szcos(ang)/6, szsin(ang)/6);
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3111 glEnd ();
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3112 }
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3113 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3114 case 's':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3115 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3116 glVertex2d (-sz/2, -sz/2);
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3117 glVertex2d (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3118 glVertex2d (sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3119 glVertex2d (sz/2, -sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3120 glEnd();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3121 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3122 case 'o':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3123 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3124 double ang_step = M_PI / 5;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3125
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3126 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3127 for (double ang = 0; ang < (2*M_PI); ang += ang_step)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3128 glVertex2d (szcos(ang)/2, szsin(ang)/2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3129 glEnd ();
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3130 }
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3131 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3132 case 'd':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3133 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3134 glVertex2d (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3135 glVertex2d (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3136 glVertex2d (0, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3137 glVertex2d (-sz/2, 0);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3138 glEnd();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3139 break;
10835 4bbd6f75f173 gl-render.cc: Transpose markers '^' and 'v'. Ben Abbott <bpabbott@mac.com> parents: 10402 diff changeset	3140 case 'v':
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3141 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3142 glVertex2f (0, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3143 glVertex2f (sz/2, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3144 glVertex2f (-sz/2, -sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3145 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3146 break;
10835 4bbd6f75f173 gl-render.cc: Transpose markers '^' and 'v'. Ben Abbott <bpabbott@mac.com> parents: 10402 diff changeset	3147 case '^':
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3148 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3149 glVertex2f (0, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3150 glVertex2f (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3151 glVertex2f (sz/2, sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3152 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3153 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3154 case '>':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3155 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3156 glVertex2f (sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3157 glVertex2f (-sz/2, sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3158 glVertex2f (-sz/2, -sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3159 glEnd ();
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3160 break;
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3161 case '<':
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3162 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
9681 40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3163 glVertex2f (-sz/2, 0);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3164 glVertex2f (sz/2, -sz/2);
40775386ab58 gl-render.cc: style fixes John W. Eaton <jwe@octave.org> parents: 9680 diff changeset	3165 glVertex2f (sz/2, sz/2);
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3166 glEnd ();
7906 b3becd212f3f Draw markers above lines John W. Eaton <jwe@octave.org> parents: 7904 diff changeset	3167 break;
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3168 case 'p':
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3169 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3170 double ang;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3171 double r;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3172 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	3173
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3174 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	3175 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	3176 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3177 ang = (-0.5 + double(i+1)/5) * M_PI;
11209 94d9d412a2a0 improve Matlab compatibility of rem and mod John W. Eaton <jwe@octave.org> parents: 11186 diff changeset	3178 r = 1.0 - (dr * fmod(double(i+1), 2.0));
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3179 glVertex2d (szrcos(ang)/2, szrsin(ang)/2);
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3180 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3181 glEnd ();
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3182 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3183 break;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3184 case 'h':
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3185 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3186 double ang;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3187 double r;
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3188 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	3189
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3190 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	3191 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	3192 {
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3193 ang = (0.5 + double(i+1)/6.0) * M_PI;
11209 94d9d412a2a0 improve Matlab compatibility of rem and mod John W. Eaton <jwe@octave.org> parents: 11186 diff changeset	3194 r = 1.0 - (dr * fmod(double(i+1), 2.0));
10924 f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3195 glVertex2d (szrcos(ang)/2, szrsin(ang)/2);
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3196 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3197 glEnd ();
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3198 }
f56255a2b890 gl-render.cc: Matlab compatible markers for the OpenGL. Ben Abbott <bpabbott@mac.com> parents: 10835 diff changeset	3199 break;
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3200 default:
002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3201 warning ("opengl_renderer: unsupported marker `%s'",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3202 marker.c_str ());
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3203 break;
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3204 }
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3205
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3206 glEndList ();
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3207
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3208 return ID;
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3209 }
7874 e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7870 diff changeset	3210
9834 92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3211 void
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3212 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	3213 uint8NDArray& pixels,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3214 Matrix& bbox,
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3215 int halign, int valign, double rotation)
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3216 {
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3217 text_renderer.text_to_pixels (txt, pixels, bbox,
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3218 halign, valign, rotation);
9834 92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3219 }
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3220
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3221 Matrix
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3222 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	3223 double x, double y, double z,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3224 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	3225 {
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3226 #if HAVE_FREETYPE
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3227 if (txt.empty ())
92d8f35ff217 compute bounding boxes for text in opengl graphics backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	3228 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	3229
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3230 uint8NDArray pixels;
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3231 Matrix bbox;
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3232 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	3233
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3234 bool blend = glIsEnabled (GL_BLEND);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3235
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3236 glEnable (GL_BLEND);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3237 glEnable (GL_ALPHA_TEST);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3238 glRasterPos3d (x, y, z);
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3239 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	3240 glDrawPixels (bbox(2), bbox(3),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3241 GL_RGBA, GL_UNSIGNED_BYTE, pixels.data ());
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3242 glDisable (GL_ALPHA_TEST);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3243 if (! blend)
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3244 glDisable (GL_BLEND);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3245
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3246 return bbox;
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3247 #else
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9687 diff changeset	3248 ::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	3249 return Matrix (1, 4, 0.0);
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3250 #endif
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3251 }
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	3252
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	3253 #endif

Mercurial > hg > octave-nkf

annotate src/gl-render.cc @ 12174:db1f49eaba6b