Revert "update for begin-mode -> primitive-type"

This reverts commit 54ead4dd26dd07c0d90d6643edb822fa322b4a46.

diff --git a/doc/figl.texi b/doc/figl.texi
index 924ac40..ac39493 100644 (file)
--- a/doc/figl.texi
+++ b/doc/figl.texi
@@ -184,9 +184,9 @@ the values.  Figl translates the names to a more common Scheme style:
 
 For example, the OpenGL API defines an enumeration with symbolic
 constants whose C names are GL_POINTS, GL_LINES, GL_TRIANGLES, and so
-on.  Collectively they form the PrimitiveType enumeration.  To access
+on.  Collectively they form the BeginMode enumeration type.  To access
 these constants in Figl, apply the constant name to the enumeration
-type: @code{(primitive-type triangles)}.
+type: @code{(begin-mode triangles)}.
 
 Bitfields are similar, though the constructor accepts multiple symbols
 and produces an appropriate mask.  In the GLUT API there is the

diff --git a/doc/gl.texi b/doc/gl.texi
index 34ad9ff..620b9ba 100644 (file)
--- a/doc/gl.texi
+++ b/doc/gl.texi
@@ -201,8 +201,8 @@ for more information.
 
 @subsubsection Begin/End Paradigm
 
-@defmac gl-begin primitive-type body ...
-Begin immediate-mode drawing with @var{primitive-type}, evaluate
+@defmac gl-begin begin-mode body ...
+Begin immediate-mode drawing with @var{begin-mode}, evaluate
 the sequence of @var{body} expressions, and then end drawing (as with
 @code{glBegin} and @code{glEnd}).
 

diff --git a/examples/particle-system/client-arrays.scm b/examples/particle-system/client-arrays.scm
index c23e129..6f688ab 100644 (file)
--- a/examples/particle-system/client-arrays.scm
+++ b/examples/particle-system/client-arrays.scm
@@ -56,7 +56,7 @@
                       *vertices*
                       #:stride (packed-struct-size color-vertex)
                       #:offset (packed-struct-offset color-vertex r))
-  (gl-draw-arrays (primitive-type quads) 0
+  (gl-draw-arrays (begin-mode quads) 0
                   (packed-array-length *vertices* color-vertex))
   (gl-disable-client-state (enable-cap color-array))
   (gl-disable-client-state (enable-cap vertex-array)))
@@ -165,7 +165,7 @@
 
 (define (draw-axis scale)
   ;; Could disable lighting and depth test.
-  (gl-begin (primitive-type lines)
+  (gl-begin (begin-mode lines)
     (gl-color 1 0 0)
     (gl-vertex 0 0 0)
     (gl-vertex scale 0 0)

diff --git a/examples/particle-system/legacy.scm b/examples/particle-system/legacy.scm
index cd13312..dedf1ba 100644 (file)
--- a/examples/particle-system/legacy.scm
+++ b/examples/particle-system/legacy.scm
@@ -49,7 +49,7 @@
 (define *particles* (make-packed-array position 0))
 
 (define (draw-particles)
-  (gl-begin (primitive-type quads)
+  (gl-begin (begin-mode quads)
     (unpack-each/serial *zquads* zquad
                         (lambda (n r g b x- y- x+ y+ z)
                           (gl-color r g b)
@@ -151,7 +151,7 @@
 
 (define (draw-axis scale)
   ;; Could disable lighting and depth test.
-  (gl-begin (primitive-type lines)
+  (gl-begin (begin-mode lines)
     (gl-color 1 0 0)
     (gl-vertex 0 0 0)
     (gl-vertex scale 0 0)

diff --git a/examples/particle-system/vbo.scm b/examples/particle-system/vbo.scm
index c92f436..1fb41f9 100644 (file)
--- a/examples/particle-system/vbo.scm
+++ b/examples/particle-system/vbo.scm
@@ -64,7 +64,7 @@
                       #f
                       #:stride (packed-struct-size color-vertex)
                       #:offset (packed-struct-offset color-vertex r))
-  (gl-draw-arrays (primitive-type quads) 0
+  (gl-draw-arrays (begin-mode quads) 0
                   (packed-array-length *vertices* color-vertex))
   (gl-disable-client-state (enable-cap color-array))
   (gl-disable-client-state (enable-cap vertex-array))
@@ -186,7 +186,7 @@
 
 (define (draw-axis scale)
   ;; Could disable lighting and depth test.
-  (gl-begin (primitive-type lines)
+  (gl-begin (begin-mode lines)
     (gl-color 1 0 0)
     (gl-vertex 0 0 0)
     (gl-vertex scale 0 0)