Mercurial > hg > octave-nkf

diff src/gl-render.cc @ 10402:9f2bf537a651

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement text extent property
author Michael Goffioul <michael.goffioul@gmail.com>
date Sun, 07 Mar 2010 21:00:07 +0000
parents 12884915a8e4
children 4bbd6f75f173
line wrap: on
line diff
--- a/src/gl-render.cc
+++ b/src/gl-render.cc
@@ -1665,6 +1665,7 @@
 
   // 3rd pass: draw remaining objects
 
+  glDisable (GL_DEPTH_TEST);
   for (it = obj_list.begin (); it != obj_list.end (); it++)
     {
       graphics_object go = (*it);
@@ -1672,6 +1673,7 @@
       set_clipping (go.get_properties ().is_clipping ());
       draw (go);
     }
+  glEnable (GL_DEPTH_TEST);
 
   set_clipping (false);
   // FIXME: finalize rendering (transparency processing)
@@ -2668,8 +2670,7 @@
   set_font (props);
   set_color (props.get_color_rgb ());
 
-  // FIXME: take "units" into account
-  const Matrix pos = xform.scale (props.get_position ().matrix_value ());
+  const Matrix pos = xform.scale (props.get_data_position ());
   int halign = 0, valign = 0;
 
   if (props.horizontalalignment_is ("center"))