Mercurial > octave-nkf

changeset 7851:002b1d8460d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added some more markers
author Shai Ayal <shaiay@users.sourceforge.net>
date Sat, 01 Mar 2008 18:54:10 +0200
parents 56254a8d4d59
children 4dc3e0ff730a
files src/graphics/ChangeLog src/graphics/opengl/gl-render.cc
diffstat 2 files changed, 102 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/src/graphics/ChangeLog	Fri Feb 29 17:49:00 2008 +0100
+++ b/src/graphics/ChangeLog	Sat Mar 01 18:54:10 2008 +0200
@@ -1,3 +1,8 @@
+2008-03-01  Shai Ayal  <shaiay@users.sourceforge.net>
+
+	* opengl/gl-render.cc (make_marker_list): Add the "+x*.^v><"
+	markers
+
 2008-02-27  Michael Goffioul  <michael.goffioul@gmail.com>
 
 	* opengl/gl-render.cc (opengl_renderer::draw(patch),
--- a/src/graphics/opengl/gl-render.cc	Fri Feb 29 17:49:00 2008 +0100
+++ b/src/graphics/opengl/gl-render.cc	Sat Mar 01 18:54:10 2008 +0200
@@ -2652,40 +2652,107 @@
   unsigned int ID = glGenLists (1);
   double sz = size * backend.get_screen_resolution () / 72.0;
 
+  // constants for the * marker
+  const double sqrt2d4 = 0.35355339059327;
+  double tt = sz*sqrt2d4;
+
   glNewList (ID, GL_COMPILE);
 
   switch (marker[0])
     {
-      case 's':
-        glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
-        glVertex2d (-sz/2, -sz/2);
-        glVertex2d (-sz/2,  sz/2);
-        glVertex2d ( sz/2,  sz/2);
-        glVertex2d ( sz/2, -sz/2);
-        glEnd();
-        break;
-      case 'o':
-        {
-          double ang_step = M_PI / 5;
-
-          glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
-          for (double ang = 0; ang < (2*M_PI); ang += ang_step)
-            glVertex2d (sz*cos(ang)/2, sz*sin(ang)/2);
-          glEnd ();
-        }
-        break;
-      case 'd':
-        glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
-        glVertex2d (    0, -sz/2);
-        glVertex2d ( sz/2,     0);
-        glVertex2d (    0,  sz/2);
-        glVertex2d (-sz/2,     0);
-        glEnd();
-        break;
-      default:
-	warning ("opengl_renderer: unsupported marker `%s'",
-		 marker.c_str ());
-	break;
+    case '+':
+      glBegin (GL_LINES);
+      glVertex2f (-sz/2 ,0     );
+      glVertex2f (sz/2  ,0     );
+      glVertex2f (0     ,-sz/2 );
+      glVertex2f (0     ,sz/2  );
+      glEnd ();
+      break;
+    case 'x':
+      glBegin(GL_LINES);
+      glVertex2f (-sz/2 ,-sz/2);
+      glVertex2f (sz/2  ,sz/2 );
+      glVertex2f (-sz/2 ,sz/2 );
+      glVertex2f (sz/2 ,-sz/2 );
+      glEnd ();
+      break;
+    case '*':
+      glBegin (GL_LINES);
+      glVertex2f (-sz/2 ,0     );
+      glVertex2f (sz/2  ,0     );
+      glVertex2f (0     ,-sz/2 );
+      glVertex2f (0     ,sz/2  );
+      glVertex2f (-tt   ,-tt   );
+      glVertex2f (+tt   ,+tt   );
+      glVertex2f (-tt   ,+tt   );
+      glVertex2f (+tt   ,-tt   );
+      glEnd ();
+      break;
+    case '.':
+      glBegin (GL_POLYGON);
+      glVertex2f (-sz/10, -sz/10);
+      glVertex2f (-sz/10, sz/10 );
+      glVertex2f (sz/10 , sz/10 );
+      glVertex2f (sz/10 , -sz/10);
+      glEnd ();
+      break;
+    case 's':
+      glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
+      glVertex2d (-sz/2, -sz/2);
+      glVertex2d (-sz/2,  sz/2);
+      glVertex2d ( sz/2,  sz/2);
+      glVertex2d ( sz/2, -sz/2);
+      glEnd();
+      break;
+    case 'o':
+      {
+	double ang_step = M_PI / 5;
+
+	glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
+	for (double ang = 0; ang < (2*M_PI); ang += ang_step)
+	  glVertex2d (sz*cos(ang)/2, sz*sin(ang)/2);
+	glEnd ();
+      }
+      break;
+    case 'd':
+      glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
+      glVertex2d (    0, -sz/2);
+      glVertex2d ( sz/2,     0);
+      glVertex2d (    0,  sz/2);
+      glVertex2d (-sz/2,     0);
+      glEnd();
+      break;
+    case '^':
+      glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
+      glVertex2f (0     ,  sz/2);
+      glVertex2f (sz/2  , -sz/2);
+      glVertex2f (-sz/2 , -sz/2);
+      glEnd ();
+      break;
+    case 'v':
+      glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
+      glVertex2f (0     ,-sz/2);
+      glVertex2f (-sz/2 ,sz/2 );
+      glVertex2f (sz/2  ,sz/2 );
+      glEnd ();
+      break;
+    case '>':
+      glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
+      glVertex2f (sz/2  ,0    );
+      glVertex2f (-sz/2 ,sz/2 );
+      glVertex2f (-sz/2 ,-sz/2);
+      glEnd ();
+      break;
+    case '<':
+      glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP));
+      glVertex2f (-sz/2 ,0    );
+      glVertex2f (sz/2  ,-sz/2);
+      glVertex2f (sz/2  ,sz/2 );
+      glEnd ();
+    default:
+      warning ("opengl_renderer: unsupported marker `%s'",
+	       marker.c_str ());
+      break;
     }
 
   glEndList ();