octave: src/gl-render.cc annotate

annotate src/gl-render.cc @ 13281:834f904a3dcb

Add support for full asynchronous graphics toolkit running in a separate thread. Add uicontrol and uipanel implementation. * oct-mutex.h (octave_base_mutex::try_lock): New method. (octave_mutex::try_lock): Likewise. (octave_auto_lock::octave_auto_lock): New argument for blocking/non-blocking locks. (octave_auto_lock::ok): New method to test locking state. (octave_auto_lock::operator bool): Likewise. (octave_thread): New utility class. * oct-mutex.cc (octave_base_mutex::try_lock): New method. (octave_w32_mutex::try_lock): Implement it for Win32. (octave_pthread_mutex::try_lock): Implement it for pthread. (octave_thread): Implement new utility class. * octave.cc (octave_main): Initialize octave_thread. * genprops.awk (emit_get_string_array): New function. (emit_declarations): Use it for string_array_property. * graphics.h.in (base_property::set): New argument to control toolkit notifying. (property::set): Likewise. (string_array_property::string_vector_value): New method. (radio_property::do_set): Add warning about abbreviated radio values. (base_graphics_toolkit::initialize): Returns bool. (graphics_toolkit::initialize): Likewise. (base_graphics_object::toolkit_flag): New member. (base_graphics_object::base_graphics_object): Initialize it. (base_graphics_object::valid_toolkit_object): New method. (base_graphics_object::initialize, base_graphics_object::finalize, base_graphics_object::update): Likewise. (graphics_object::initialize, graphics_object::finalize, graphics_object::update): Likewise. (figure::properties::set_toolkit): Move implementation to source file. (base_properties::get_boundingbox): Add parent size argument for optimization. (figure::properties::get_boundingbox): Likewise. (axes::properties::get_boundingbox): Likewise. (figure::properties::map_from_boundingbox): New utility method. (figure::properties::map_to_boundingbox): Likewise. (axes::properties::get_fontsize_points): New utility method. (text::properties::get_fontsize_points): Likewise. (axes::properties::xlabel, axes::properties::ylabel, axes::properties::zlabel, axes::properties::title): Don't notify toolkit on initialization. (axes::initialize): New method override. (uicontrol): New class. (uipanel): Likewise. (graphics_event::create_callback_event): New static method overload. (graphics_event::create_set_event): New argument to prevent circular behavior when property change is triggered from the toolkit. (gh_manager::post_set): Likewise. (gh_manager::do_post_set): Likewise. (gh_manager::make_graphics_handle): New argument controlling toolkit notify. (gh_manager::make_figure_handle): Likewise. (gh_manager::do_make_graphics_handle): Likewise. (gh_manager::do_make_figure_handle): Likewise. (gh_manager::try_lock): New static method. (gh_manager::execute_listener): Likewise. (gh_manager::enable_event_processing): Likewise. (gh_manager::do_try_lock): New method. (gh_manager::do_execute_listener): Likewise. (gh_manager::do_enable_event_processing): Likewise. (gh_manager::event_processing): New member. (gh_manager::execute_callback): Protect graphics_object access. (gh_manager::auto_lock): Inherits from octave_autolock. Renamed from autolock. (gh_manager::auto_lock::auto_lock): New blocking/non-blocking argument. * graphics.cc (default_control_position, default_control_sliderstep, default_panel_position): New utility functions. (convert_font_size): New utility function. (convert_position): Support 2D-only positions. (lookup_object_name): Support uicontrol and uipanel. (make_graphics_object_from_type): Likewise. (root_figure::init_factory_properties): Likewise. (property_list::set, property_list::lookup): Likewise. (base_property::set): New argument controlling toolkit notifying. (base_property::run_listeners): Call gh_manager::execute_listener, allowing to set a property from another thread and run listeners synchronously with octave. (color_property::do_set): Add warning about abbreviated radio value. (double_radio_property::do_set): Likewise. (finalize_r, initialize_r, xinitialize): New utility functions. (gh_manager::do_free): Calls graphics_object::finalize. (base_graphics_toolkit::initialize): Returns bool. (gnuplot_toolkit::initialize): Likewise. (figure::properties::set_toolkit): Move implementation from header. (figure::properties::get_boundingbox): New argument for parent size. (axes::properties::get_boundingbox): Likewise. (figure::properties::map_from_boundingbox): New utility method. (figure::properties::map_to_boundingbox): Likewise. (axes::properties::update_fontunits): Use convert_font_size. (axes::properties::get_fontsize_points): New utility method. (text::properties::get_fontsize_points): Likewise. (axes::initialize): New method override to trigger initialization of labels and title. (uicontrol): New class. (uipanel): Likewise. (gh_manager::gh_manager): Initialize new event_processing member. (gh_manager::do_make_graphics_handle): New argument controlling toolkit notifying. (gh_manager::do_make_figure_handle): Likewise. (callback_event::callback): New member. (callback_event::callback_event): Initialize it. (callback_event::execute): Use it. (set_event::notify_toolkit): New member. (set_event::set_event): Initialize it. (set_event::execute): Use it. Also allow to set read-only properties. (graphics_event::create_callback_event): New static method overload. (graphics_event::create_set_event): New argument controlling toolkit notifying. (gh_manager::do_restore_gcbo): Rename autolock to auto_lock. (gh_manager::do_post_callback, gh_manager::do_post_function): Likewise. (Fishandle, Fset, Fget, F__get__): Likewise. (F__go_figure__, F__calc_dimensions__, GO_BODY): Likewise. (F__go_delete__, F__go_axes_init__, F__go_handles__, F__go_figure_handles__, Favailable_graphics_toolkits, Faddlistener, Fdellistener, Faddproperty): Likewise. (get_property_from_handle, set_property_in_handle): Likewise. (gh_manager::do_post_set): Likewise. New argument controlling toolkit notifying. (gh_manager::do_execute_listener): New method. (gh_manager::do_enable_event_processing): Likewise. (gh_manager::do_execute_callback): Check callback argument validity. Rename autolock to auto_lock. (gh_manager::do_process_events): Execute drawnow at the end of event processing loop, avoiding recursivity. Maintain the input event hook if gh_manager::event_processing is non zero. (make_graphics_object): Postpone object's toolkit initialization at the end of the object creation. (F__go_figure__): Likewise. (F__go_uicontrol__, F__go_uipanel__): New functions. * __init_fltk__.cc (fltk_graphics_toolkit::initialise): New method. * gl-render.h (opengl_renderer::draw): New argument to identify top-level calls. (opengl_renderer::draw_uipanel): New method. (opengl_renderer::init_gl_context): Likewise. * gl-render.cc (opengl_renderer::draw): New argument to identify top-level calls. Skip uicontrol objects. Handle uipanel objects when top-level. (opengl_renderer::init_gl_context): New method. (opengl_renderer::draw_figure): Use it. (opengl_renderer::draw_uipanel): New method.

author	Michael Goffioul <michael.goffioul@gmail.com>
date	Thu, 06 Oct 2011 16:44:18 +0100
parents	cf5ebc0e47e4
children	22ce748da25f

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

Mercurial > octave

annotate src/gl-render.cc @ 13281:834f904a3dcb