From 54ead4dd26dd07c0d90d6643edb822fa322b4a46 Mon Sep 17 00:00:00 2001 From: Daniel Hartwig Date: Thu, 18 Jul 2013 18:26:48 +0800 Subject: [PATCH] update for begin-mode -> primitive-type --- doc/figl.texi | 4 ++-- doc/gl.texi | 4 ++-- examples/particle-system/client-arrays.scm | 4 ++-- examples/particle-system/legacy.scm | 4 ++-- examples/particle-system/vbo.scm | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/figl.texi b/doc/figl.texi index ac39493..924ac40 100644 --- 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 BeginMode enumeration type. To access +on. Collectively they form the PrimitiveType enumeration. To access these constants in Figl, apply the constant name to the enumeration -type: @code{(begin-mode triangles)}. +type: @code{(primitive-type 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 620b9ba..34ad9ff 100644 --- a/doc/gl.texi +++ b/doc/gl.texi @@ -201,8 +201,8 @@ for more information. @subsubsection Begin/End Paradigm -@defmac gl-begin begin-mode body ... -Begin immediate-mode drawing with @var{begin-mode}, evaluate +@defmac gl-begin primitive-type body ... +Begin immediate-mode drawing with @var{primitive-type}, 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 6f688ab..c23e129 100644 --- 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 (begin-mode quads) 0 + (gl-draw-arrays (primitive-type 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 (begin-mode lines) + (gl-begin (primitive-type 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 dedf1ba..cd13312 100644 --- 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 (begin-mode quads) + (gl-begin (primitive-type 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 (begin-mode lines) + (gl-begin (primitive-type 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 1fb41f9..c92f436 100644 --- 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 (begin-mode quads) 0 + (gl-draw-arrays (primitive-type 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 (begin-mode lines) + (gl-begin (primitive-type lines) (gl-color 1 0 0) (gl-vertex 0 0 0) (gl-vertex scale 0 0) -- 2.20.1