(no commit message)

diff --git a/gacela.lisp b/gacela.lisp
index dcbddde6836162300ffa5a89af9c8512c9da1975..9663a82d1028b8a9feaa8594a187cf05c46a5e09 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -127,11 +127,11 @@
     t))
 
 (let ((current-color '(1 1 1 1)))
-  (defun get-color ()
+  (defun get-current-color ()
     current-color)
 
-  (defun set-color (red green blue (&optional (alpha 1)))
-    (setq current-color color)
+  (defun set-current-color (red green blue &optional (alpha 1))
+    (setq current-color (list red green blue alpha))
     (glColor4f red green blue alpha)))
 
 (defun copy-surface (source)
@@ -312,18 +312,6 @@
 
 
 ;;; GaCeLa Functions
-;(defun game-loop (code)
-;  (process-events)
-;  (cond ((quit?) nil)
-;      (t
-;       (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
-;       (glLoadIdentity)
-;       (translate 0 0 *zoom*)
-;       (funcall code)
-;       (SDL_GL_SwapBuffers)
-;       (SDL_Delay (- *gacela-freq* (rem (SDL_GetTicks) *gacela-freq*)))
-;       (game-loop code))))
-
 (let (commands)
   (defun prog-command (command)
     (setq commands (cons command commands)))
@@ -367,19 +355,6 @@
         (process-events)
         (setq running nil))))
 
-;(defun run-game ()
-;  (init-video-mode)
-;  (SDL_WM_SetCaption *title-screen* "")
-;  (refresh-active-procs)
-;  (enjoy!)
-;  (do () ((quit?))
-;      (process-events)
-;      (logic-procs)
-;      (motion-procs)
-;      (refresh-active-procs)
-;      (refresh-screen)
-;      (SDL_Delay (- *gacela-freq* (rem (SDL_GetTicks) *gacela-freq*)))))
-
 (defun quit-game ()
 ;  (free-all-resources)
 ;  (quit-audio)

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 88e773848334c5fc9d974ef718d8178812440f24..7c5a2d97b846baae6a6d38014288b60d7e950378 100644 (file)
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -28,6 +28,12 @@
   (defun 3d-mode? ()
     (eq mode '3d)))
 
+(defmacro with-color (color &body code)
+  `(progn
+     (apply #'set-current-color ,color)
+     ,@code
+     (apply #'set-current-color ,(get-current-color))))
+
 (defun draw (&rest vertexes)
   (begin-draw (length vertexes))
   (draw-vertexes vertexes)