(no commit message)

[gacela.git] / gacela.lisp

diff --git a/gacela.lisp b/gacela.lisp
index df3fe3608361b19b128fbf8c3cd313271e3f137d..dcbddde6836162300ffa5a89af9c8512c9da1975 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -99,11 +99,12 @@
   t)
 
 (defmacro progn-textures (&body code)
-  `(progn
+  `(let (values)
      (init-video-mode)
      (glEnable GL_TEXTURE_2D)
-     ,@code
-     (glDisable GL_TEXTURE_2D)))
+     (setq values (multiple-value-list (progn ,@code)))
+     (glDisable GL_TEXTURE_2D)
+     (apply #'values values)))
 
 (defun init-textures ()
   (init-video-mode)
@@ -125,6 +126,14 @@
     (glLoadIdentity)
     t))
 
+(let ((current-color '(1 1 1 1)))
+  (defun get-color ()
+    current-color)
+
+  (defun set-color (red green blue (&optional (alpha 1)))
+    (setq current-color color)
+    (glColor4f red green blue alpha)))
+
 (defun copy-surface (source)
   (cond ((surface-p source)
         (let ((new-surface