From f1df2e76d1d23ca540a564634aa708fb3de62d0d Mon Sep 17 00:00:00 2001
From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
Date: Sun, 28 Sep 2014 04:04:08 +0000
Subject: [PATCH] drawing join dots on stroke fonts is now optional (and
 default off)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1705 7f0cb862-5218-0410-a997-914c9d46530a
---
 freeglut/freeglut/include/GL/freeglut_ext.h |  2 ++
 freeglut/freeglut/src/fg_font.c             | 12 ++++++++----
 freeglut/freeglut/src/fg_init.c             |  1 +
 freeglut/freeglut/src/fg_internal.h         |  2 ++
 freeglut/freeglut/src/fg_state.c            |  7 +++++++
 freeglut/web-src/docs/api.php               |  2 ++
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/freeglut/freeglut/include/GL/freeglut_ext.h b/freeglut/freeglut/include/GL/freeglut_ext.h
index 6f0a048..9c3eee1 100644
--- a/freeglut/freeglut/include/GL/freeglut_ext.h
+++ b/freeglut/freeglut/include/GL/freeglut_ext.h
@@ -88,6 +88,8 @@
 
 #define  GLUT_GEOMETRY_VISUALIZE_NORMALS    0x0205
 
+#define  GLUT_STROKE_FONT_DRAW_JOIN_DOTS    0x0206  /* Draw dots between line segments of stroke fonts? */
+
 /*
  * New tokens for glutInitDisplayMode.
  * Only one GLUT_AUXn bit may be used at a time.
diff --git a/freeglut/freeglut/src/fg_font.c b/freeglut/freeglut/src/fg_font.c
index c0f0479..9e73949 100644
--- a/freeglut/freeglut/src/fg_font.c
+++ b/freeglut/freeglut/src/fg_font.c
@@ -278,10 +278,14 @@ void FGAPIENTRY glutStrokeCharacter( void* fontID, int character )
         for( j = 0; j < strip->Number; j++ )
             glVertex2f( strip->Vertices[ j ].X, strip->Vertices[ j ].Y );
         glEnd( );
-				glBegin( GL_POINTS );
-        for( j = 0; j < strip->Number; j++ )
-            glVertex2f( strip->Vertices[ j ].X, strip->Vertices[ j ].Y );
-				glEnd( );
+        
+        if (fgState.StrokeFontDrawJoinDots)
+        {
+            glBegin( GL_POINTS );
+            for( j = 0; j < strip->Number; j++ )
+                glVertex2f( strip->Vertices[ j ].X, strip->Vertices[ j ].Y );
+            glEnd( );
+        }
     }
     glTranslatef( schar->Right, 0.0, 0.0 );
 }
diff --git a/freeglut/freeglut/src/fg_init.c b/freeglut/freeglut/src/fg_init.c
index 4061836..fda824d 100644
--- a/freeglut/freeglut/src/fg_init.c
+++ b/freeglut/freeglut/src/fg_init.c
@@ -87,6 +87,7 @@ SFG_State fgState = { { -1, -1, GL_FALSE },  /* Position */
                       1,                      /* AuxiliaryBufferNumber */
                       4,                      /* SampleNumber */
                       GL_FALSE,               /* SkipStaleMotion */
+                      GL_FALSE,               /* StrokeFontDrawJoinDots */
                       1,                      /* OpenGL context MajorVersion */
                       0,                      /* OpenGL context MinorVersion */
                       0,                      /* OpenGL ContextFlags */
diff --git a/freeglut/freeglut/src/fg_internal.h b/freeglut/freeglut/src/fg_internal.h
index 5e35378..8c0be9b 100644
--- a/freeglut/freeglut/src/fg_internal.h
+++ b/freeglut/freeglut/src/fg_internal.h
@@ -342,6 +342,8 @@ struct tagSFG_State
 
     GLboolean        SkipStaleMotion;      /* skip stale motion events */
 
+    GLboolean        StrokeFontDrawJoinDots;/* Draw dots between line segments of stroke fonts? */
+
     int              MajorVersion;         /* Major OpenGL context version  */
     int              MinorVersion;         /* Minor OpenGL context version  */
     int              ContextFlags;         /* OpenGL context flags          */
diff --git a/freeglut/freeglut/src/fg_state.c b/freeglut/freeglut/src/fg_state.c
index 580ff10..bb2e8f7 100644
--- a/freeglut/freeglut/src/fg_state.c
+++ b/freeglut/freeglut/src/fg_state.c
@@ -118,6 +118,10 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
         fgStructure.CurrentWindow->State.VisualizeNormals = value;
       break;
 
+    case GLUT_STROKE_FONT_DRAW_JOIN_DOTS:
+      fgState.StrokeFontDrawJoinDots = value;
+      break;
+
     default:
         fgWarning( "glutSetOption(): missing enum handle %d", eWhat );
         break;
@@ -218,6 +222,9 @@ int FGAPIENTRY glutGet( GLenum eWhat )
         return GL_FALSE;
       return fgStructure.CurrentWindow->State.VisualizeNormals;
 
+    case GLUT_STROKE_FONT_DRAW_JOIN_DOTS:
+        return fgState.StrokeFontDrawJoinDots;
+
     default:
         return fgPlatformGlutGet ( eWhat );
         break;
diff --git a/freeglut/web-src/docs/api.php b/freeglut/web-src/docs/api.php
index 0bb298e..d4c6371 100644
--- a/freeglut/web-src/docs/api.php
+++ b/freeglut/web-src/docs/api.php
@@ -1527,6 +1527,8 @@ windows if GLUT_MULTISAMPLE was set in the displayMode.</li>
 <li>GLUT_GEOMETRY_VISUALIZE_NORMALS - Set whether <a
 href="#GeometricObject"><i>FreeGLUT</i>'s geometric object rendering
 functions</a> also visualize the object's normals or not.</li>
+<li>GLUT_STROKE_FONT_DRAW_JOIN_DOTS - Set whether join dots are drawn
+between line segments when drawing letters of stroke fonts or not.</li>
 </ul>
 </p>