Change :color-buffer-bit to :color-buffer, etc, in the examples

darcs-hash:20070306043408-28748-4243e098230d7857d926534fc46a5327dca60064.gz
3b · Mar 6, 2007 · 6ea7fac · 6ea7fac
1 parent d20d8c0
commit 6ea7fac
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 44 deletions.
diff --git a/examples/mesademos/gears-raw.lisp b/examples/mesademos/gears-raw.lisp
@@ -25,7 +25,7 @@
     (gl:shade-model :flat)
     (gl:normal 0 0 1)
     ;; Draw front face.
-    (gl:with-primitives :quad-strip 
+    (gl:with-primitives :quad-strip
       (dotimes (i (1+ n-teeth))
         (let ((angle (/ (* i 2.0 +pif+) n-teeth)))
           (gl:vertex (* r0 (cos angle)) (* r0 (sin angle)) (* width 0.5))
@@ -57,7 +57,7 @@
           (gl:vertex (* r1 (cos (+ angle (* 3 da))))
                        (* r1 (sin (+ angle (* 3 da))))
                        (* width -0.5))
-          (gl:vertex (* r0 (cos angle)) (* r0 (sin angle)) (* width -0.5))))) 
+          (gl:vertex (* r0 (cos angle)) (* r0 (sin angle)) (* width -0.5)))))
     ;; Draw back sides of teeth.
     (gl:with-primitives :quads
       (dotimes (i n-teeth)
@@ -131,7 +131,7 @@
 (defvar *t0* 0)
 
 (cffi:defcallback draw :void ()
-  (gl:clear :color-buffer-bit :depth-buffer-bit)
+  (gl:clear :color-buffer :depth-buffer)
   (gl:push-matrix)
   (gl:rotate *view-rotx* 1 0 0)
   (gl:rotate *view-roty* 0 1 0)
@@ -192,7 +192,7 @@
     (:key-right (decf *view-roty* 5.0)))
   (glut:post-redisplay))
 
-(cffi:defcallback reshape :void ((width :int) (height :int)) 
+(cffi:defcallback reshape :void ((width :int) (height :int))
   (gl:viewport 0 0 width height)
   (gl:matrix-mode :projection)
   (gl:load-identity)

diff --git a/examples/mesademos/gears.lisp b/examples/mesademos/gears.lisp
@@ -163,7 +163,7 @@
 (defmethod glut:display ((window gears-window))
   (with-slots (view-rotx view-roty view-rotz angle gear1 gear2 gear3)
       window
-    (gl:clear :color-buffer-bit :depth-buffer-bit)
+    (gl:clear :color-buffer :depth-buffer)
     (gl:with-pushed-matrix
       (gl:rotate view-rotx 1 0 0)
       (gl:rotate view-roty 0 1 0)

diff --git a/examples/misc/glut-teapot.lisp b/examples/misc/glut-teapot.lisp
@@ -24,7 +24,7 @@
   (gl:rotate 30 1 1 0)
   (gl:light :light0 :position '(0 1 1 0))
   (gl:light :light0 :diffuse '(0.2 0.4 0.6 0))
-  (gl:clear :color-buffer-bit :depth-buffer-bit)
+  (gl:clear :color-buffer :depth-buffer)
   (gl:color 1 1 1)
   (gl:front-face :cw)
   (glut:solid-teapot 1.3)

diff --git a/examples/misc/render-to-texture.lisp b/examples/misc/render-to-texture.lisp
@@ -108,7 +108,7 @@
 
 (defun draw-teapot ()
   (gl:clear-color 0 0.3 0.5 1.0)
-  (gl:clear :color-buffer-bit :depth-buffer-bit)
+  (gl:clear :color-buffer :depth-buffer)
 
   (gl:disable :blend :texture-2d)
   (gl:enable :lighting :light0 :depth-test)
@@ -123,7 +123,7 @@
   (gl:rotate *teapot-rotation-x* 1 0 0)
   (gl:rotate *teapot-rotation-y* 0 1 0)
   (gl:rotate *teapot-rotation-z* 0 0 1)
-    
+
   (gl:color 1 1 1)
   (glut:solid-teapot 1.3)
 
@@ -136,7 +136,7 @@
 
 (defun draw-spinning-quad (texture)
   (gl:clear-color 0 0 0 0)
-  (gl:clear :color-buffer-bit :depth-buffer-bit)
+  (gl:clear :color-buffer :depth-buffer)
 
   (gl:disable :lighting)
   (gl:enable :blend :texture-2d :depth-test)
@@ -175,5 +175,5 @@
     (gl:color 1 1 1 0)
     (gl:vertex 1 -1)
     (gl:tex-coord 0 0.5)
-    (gl:vertex -1 -1)) 
+    (gl:vertex -1 -1))
   (incf *quad-rotation* 0.1))
diff --git a/examples/redbook/clip.lisp b/examples/redbook/clip.lisp
@@ -19,7 +19,7 @@
   (gl:shade-model :flat))
 
 (defmethod glut:display ((w clip-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   (gl:color 1 1 1)
   (gl:with-pushed-matrix
     (gl:translate 0 0 -5)

diff --git a/examples/redbook/cube.lisp b/examples/redbook/cube.lisp
@@ -21,7 +21,7 @@
   (gl:shade-model :flat))
 
 (defmethod glut:display ((w cube-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   (gl:color 1 1 1)
   (gl:load-identity) ; clear the matrix
   ;; viewing transformation

diff --git a/examples/redbook/double.lisp b/examples/redbook/double.lisp
@@ -21,7 +21,7 @@
   (gl:shade-model :flat))
 
 (defmethod glut:display ((w double-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   (gl:with-pushed-matrix
     (gl:rotate (slot-value w 'spin) 0 0 1)
     (gl:color 1 1 1)

diff --git a/examples/redbook/hello.lisp b/examples/redbook/hello.lisp
@@ -28,7 +28,7 @@
   (gl:ortho 0 1 0 1 -1 1))
 
 (defmethod glut:display ((w hello-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   ;; Draw white polygon (rectangle) with corners at
   ;; (0.25, 0.25, 0.0) and (0.75, 0.75, 0.0).
   (gl:color 1 1 1)

diff --git a/examples/redbook/lines.lisp b/examples/redbook/lines.lisp
@@ -26,7 +26,7 @@
   (gl:shade-model :flat))
 
 (defmethod glut:display ((w lines-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   ;; Select white for all lines.
   (gl:color 1 1 1)
   ;; In 1st row, 3 lines, each with a different stipple.

diff --git a/examples/redbook/list.lisp b/examples/redbook/list.lisp
@@ -5,15 +5,13 @@
 ;;;   Copyright (c) 1993-1997, Silicon Graphics, Inc.
 ;;;   ALL RIGHTS RESERVED
 
-;;; This program demonstrates how to make and execute a 
-;;; display list.  Note that attributes, such as current 
+;;; This program demonstrates how to make and execute a
+;;; display list.  Note that attributes, such as current
 ;;; color and matrix, are changed.
 
 (in-package #:cl-glut-examples)
 
 (defclass list-window (glut:window)
-  ;; TODO: use some more interesting interface for (de)allocating
-  ;; display lists...
   ((list-name :accessor list-name :initform (gl:gen-lists 1)))
   (:default-initargs
    :width 600 :height 50 :title "list.lisp" :mode '(:single :rgb)))
@@ -29,7 +27,7 @@
   (gl:shade-model :flat))
 
 (defmethod glut:display ((w list-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   (gl:color 0 1 0)                      ; current color green
   (loop repeat 10 do (gl:call-list (list-name w)))
   (gl:with-primitives :lines            ; is this line green? NO!

diff --git a/examples/redbook/model.lisp b/examples/redbook/model.lisp
@@ -24,7 +24,7 @@
              (gl:vertex 0 25)
              (gl:vertex 25 -25)
              (gl:vertex -25 -25))))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   (gl:color 1 1 1)
   ;; triangle with solid-lines
   (gl:load-identity)

diff --git a/examples/redbook/movelight.lisp b/examples/redbook/movelight.lisp
@@ -37,7 +37,7 @@
 ;;; light at a new position in world coordinates.  The cube
 ;;; represents the position of the light.
 (defmethod glut:display ((w movelight-window))
-  (gl:clear :color-buffer-bit :depth-buffer-bit)
+  (gl:clear :color-buffer :depth-buffer)
   (gl:with-pushed-matrix
     (glu:look-at 0 0 5 0 0 0 0 1 0)
     (gl:with-pushed-matrix

diff --git a/examples/redbook/planet.lisp b/examples/redbook/planet.lisp
@@ -24,7 +24,7 @@
   (gl:shade-model :flat))
 
 (defmethod glut:display ((w planet-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   (gl:color 1 1 1)
   (gl:with-pushed-matrix
     ;; draw sun

diff --git a/examples/redbook/polys.lisp b/examples/redbook/polys.lisp
@@ -37,25 +37,25 @@
     #x10 #x18 #x18 #x08 #x10 #x00 #x00 #x08))
 
 (defparameter *halftone*
-  #(#xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55 
-    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55 
+  #(#xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
+    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
+    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
+    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
+    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
+    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
+    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
+    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
+    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
+    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
     #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
-    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55 
-    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55 
     #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
-    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55 
-    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55 
     #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
-    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55 
-    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55 
     #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
-    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55 
-    #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55 
     #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55
     #xAA #xAA #xAA #xAA #x55 #x55 #x55 #x55))
 
 (defmethod glut:display ((w polys-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   (gl:color 1 1 1)
   ;; Draw one solid, unstippled rectangles then two
   ;; stippled rectangles.

diff --git a/examples/redbook/robot.lisp b/examples/redbook/robot.lisp
@@ -24,7 +24,7 @@
   (gl:shade-model :flat))
 
 (defmethod glut:display ((w robot-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   (gl:with-pushed-matrix
     ;; first cube
     (gl:translate -1 0 0)

diff --git a/examples/redbook/smooth.lisp b/examples/redbook/smooth.lisp
@@ -20,7 +20,7 @@
   (gl:shade-model :smooth))
 
 (defmethod glut:display ((w smooth-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   (gl:with-primitives :triangles
     (gl:color 1 0 0)
     (gl:vertex 5 5)

diff --git a/examples/redbook/stroke.lisp b/examples/redbook/stroke.lisp
@@ -5,9 +5,9 @@
 ;;;   Copyright (c) 1993-1997, Silicon Graphics, Inc.
 ;;;   ALL RIGHTS RESERVED
 
-;;; This program demonstrates some characters of a 
+;;; This program demonstrates some characters of a
 ;;; stroke (vector) font.  The characters are represented
-;;; by display lists, which are given numbers which 
+;;; by display lists, which are given numbers which
 ;;; correspond to the ASCII values of the characters.
 ;;; Use of GL:CALL-LISTS is demonstrated.
 
@@ -57,7 +57,7 @@
 (defmethod glut:display ((w stroke-window))
   (flet ((print-stroked-string (string)
            (gl:call-lists (map 'vector #'char-code string))))
-    (gl:clear :color-buffer-bit)
+    (gl:clear :color-buffer)
     (gl:color 1 1 1)
     (gl:with-pushed-matrix
       (gl:scale 2 2 2)

diff --git a/examples/redbook/varray.lisp b/examples/redbook/varray.lisp
@@ -28,13 +28,10 @@
                   0.75 0.75 0.75
                   0.35 0.35 0.35
                   0.5 0.5 0.5)))
-
     (gl:enable-client-state :vertex-array)
     (gl:enable-client-state :color-array)
-
     (gl:vertex-pointer 2 :int 0 vertices)
     (gl:color-pointer 3 :float 0 colors)))
-
 
 (defun setup-interleave ()
   (let ((intertwined '(1.0 0.2 1.0 100.0 100.0 0.0
@@ -43,7 +40,6 @@
                        0.2 1.0 0.2 200.0 300.0 0.0
                        0.2 1.0 1.0 300.0 200.0 0.0
                        0.2 0.2 1.0 200.0 100.0 0.0)))
-
     (gl:interleaved-arrays :c3f-v3f 0 intertwined)))
 
 (defmethod glut:display-window :before ((w varray-window))
@@ -52,7 +48,7 @@
   (setup-pointers))
 
 (defmethod glut:display ((w varray-window))
-  (gl:clear :color-buffer-bit)
+  (gl:clear :color-buffer)
   (ecase (deref-method w)
     (draw-array
      (gl:draw-arrays :triangles 0 6))