(no commit message)

diff --git a/gacela.lisp b/gacela.lisp
index 140f0edbcdbd5dcccbb337261786f023e9a7c648..df3fe3608361b19b128fbf8c3cd313271e3f137d 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -98,6 +98,13 @@
   (glHint GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST)
   t)
 
+(defmacro progn-textures (&body code)
+  `(progn
+     (init-video-mode)
+     (glEnable GL_TEXTURE_2D)
+     ,@code
+     (glDisable GL_TEXTURE_2D)))
+
 (defun init-textures ()
   (init-video-mode)
   (glEnable GL_TEXTURE_2D))

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 2e9ddbaf005ff06972684fb8eab94f70864b37e2..67a3dde37b4dc9828015bca1c8b4fb60e42d33a2 100644 (file)
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -68,23 +68,23 @@
                      (cond ((/= zoomed-image 0) (values zoomed-image width height))))))))))
 
 (defun load-texture (filename &optional (min-filter GL_LINEAR) (mag-filter GL_LINEAR))
-  (init-textures)
-  (init-video-mode)
-  (multiple-value-bind
-   (image real-w real-h) (load-image-for-texture filename)
+;  (init-textures)
+;  (init-video-mode)
+  (progn-textures
+   (multiple-value-bind
+    (image real-w real-h) (load-image-for-texture filename)
         (cond (image
               (let ((width (surface-w image)) (height (surface-h image))
                     (byteorder (if (= (SDL_ByteOrder) SDL_LIL_ENDIAN)
                                    (if (= (surface-format-BytesPerPixel image) 3) GL_BGR GL_BGRA)
                                    (if (= (surface-format-BytesPerPixel image) 3) GL_RGB GL_RGBA)))
-
                     (texture (car (glGenTextures 1))))
                 (glBindTexture GL_TEXTURE_2D texture)
                 (glTexImage2D GL_TEXTURE_2D 0 3 width height 0 byteorder GL_UNSIGNED_BYTE (surface-pixels image))
                 (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MIN_FILTER min-filter)
                 (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MAG_FILTER mag-filter)
                 (SDL_FreeSurface image)
-                (values texture real-w real-h))))))
+                (values texture real-w real-h)))))))
 
 (defun draw-image-function (filename)
   (multiple-value-bind
@@ -94,13 +94,14 @@
                 (draw-rectangle (* f width) (* f height) :texture texture))))))
 
 (defun draw-quad (v1 v2 v3 v4 &key texture color)
-  (cond (texture (glBindTexture GL_TEXTURE_2D texture)
-                (begin-draw 4)
-                (draw-vertex v1 :texture-coord '(0 0))
-                (draw-vertex v2 :texture-coord '(1 0))
-                (draw-vertex v3 :texture-coord '(1 1))
-                (draw-vertex v4 :texture-coord '(0 1))
-                (glEnd))
+  (cond (texture (progn-textures
+                 (glBindTexture GL_TEXTURE_2D texture)
+                 (begin-draw 4)
+                 (draw-vertex v1 :texture-coord '(0 0))
+                 (draw-vertex v2 :texture-coord '(1 0))
+                 (draw-vertex v3 :texture-coord '(1 1))
+                 (draw-vertex v4 :texture-coord '(0 1))
+                 (glEnd)))
        (t (cond (color (draw-color color)))
           (draw v1 v2 v3 v4))))
 

diff --git a/gacela_tetris.lisp b/gacela_tetris.lisp
index d6bf14a19f2b8606776613e36da8740efc7fdfdf..95268fc0c9efcf728aaaa9cd6cd3a74253d3e49a 100644 (file)
--- a/gacela_tetris.lisp
+++ b/gacela_tetris.lisp
@@ -1,6 +1,6 @@
 (in-package :gacela)
 
-(setq *frames-per-second* 15)
+(set-frames-per-second 15)
 
 (defun tetramine-i ()
   (let ((color '(1 0 0)))