(no commit message)

diff --git a/gacela.lisp b/gacela.lisp
index 8cd0da8271b25d7324862b454a0cd7054412be3f..3f75376d1027ea30daabcee77c35d8fbaf9264bc 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -172,7 +172,7 @@
                         :constructor constructor
                         :destructor destructor
                         :free-function free-function
-                        :time (if static -1 (SDL_GetTicks)))))
+                        :time (if static t (SDL_GetTicks)))))
 
   (defun get-resource (key)
     (let ((resource (gethash key resources-table)))

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 4c96b580808241293ca9850554bdf83885877f7a..31790dabbb8c2de7d0e512ca4e2af42405403511 100644 (file)
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -75,27 +75,30 @@
 (defun load-texture (filename &key (min-filter GL_LINEAR) (mag-filter GL_LINEAR) static)
   (let ((key (make-resource-texture :filename filename :min-filter min-filter :mag-filter mag-filter)))
     (cond ((get-resource key) key)
-         (t
-          (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)
-                     (set-resource key
-                                   `(:id-texture ,texture :width ,real-w :height ,real-h)
-                                   (lambda () (load-texture filename :min-filter min-filter :mag-filter mag-filter :static static))
-                                   (lambda () (glDeleteTextures 1 `(,texture)))
-                                   :static static)
-                     key)))))))))
+         (t (true-load-texture filename min-filter mag-filter static)))))
+
+(defun true-load-texture (filename min-filter mag-filter static)
+  (let ((key (make-resource-texture :filename filename :min-filter min-filter :mag-filter mag-filter)))
+    (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)
+              (set-resource key
+                            `(:id-texture ,texture :width ,real-w :height ,real-h)
+                            (lambda () (true-load-texture filename min-filter mag-filter static))
+                            (lambda () (glDeleteTextures 1 `(,texture)))
+                            :static static)
+              key)))))))
 
 (defun draw-image-function (filename)
   (multiple-value-bind

diff --git a/gacela_ttf.lisp b/gacela_ttf.lisp
index 0077ad42aa4c372cb5056bf9e9132c387199e9d6..931f3c89ba2b688ecceab160975915916e042abf 100644 (file)
--- a/gacela_ttf.lisp
+++ b/gacela_ttf.lisp
@@ -16,20 +16,23 @@
 
 (in-package :gacela)
 
-(defun open-font (font-file &key (size 80) (encoding ft_encoding_unicode) static)
+(defun load-font (font-file &key (size 80) (encoding ft_encoding_unicode) static)
   (let ((key (make-resource-font :filename font-file :size size :encoding encoding)))
     (cond ((get-resource key) key)
-         (t
-          (let ((font (ftglCreateTextureFont font-file)))
-            (cond ((/= font 0)
-                   (ftglSetFontFaceSize font size 72)
-                   (ftglSetFontCharMap font encoding)
-                   (set-resource key
-                                 `(:id-font ,font)
-                                 (lambda () (open-font font-file :size size :encoding encoding :static static))
-                                 (lambda () (ftglDestroyFont font))
-                                 :static static)
-                   key)))))))
+         (t (true-load-font font-file size encoding static)))))
+
+(defun true-load-font (font-file size encoding static)
+  (let ((key (make-resource-font :filename font-file :size size :encoding encoding))
+       (font (ftglCreateTextureFont font-file)))
+    (cond ((/= font 0)
+          (ftglSetFontFaceSize font size 72)
+          (ftglSetFontCharMap font encoding)
+          (set-resource key
+                        `(:id-font ,font)
+                        (lambda () (true-load-font font-file size encoding static))
+                        (lambda () (ftglDestroyFont font))
+                        :static static)
+          key))))
 
 (defun render-text (text font)
   (ftglRenderFont (getf font :id-font) text FTGL_RENDER_ALL))