X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=inline;f=gacela_SDL.lisp;h=5dd383eefed4f661033d5ea479c8ee4e3b36831b;hb=3747c2cd2da9c0a618628fa649ece29830581464;hp=af72bf1712de85475736ad3b046331c3f3fef505;hpb=a559c9a47d17f1a7ca0a4dff3edcd39449d1821e;p=gacela.git
diff --git a/gacela_SDL.lisp b/gacela_SDL.lisp
index af72bf1..5dd383e 100644
--- a/gacela_SDL.lisp
+++ b/gacela_SDL.lisp
@@ -15,13 +15,24 @@
;;; along with this program. If not, see .
-(in-package :gacela)
+(eval-when (compile load eval)
+ (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+ (in-package 'gacela :nicknames '(gg) :use '(lisp)))
+
+
+(defmacro mapcconst (type c-type name)
+ (let ((c-header (concatenate 'string c-type " gacela_" name " (void)"))
+ (c-body (concatenate 'string "return " name ";"))
+ (c-name (concatenate 'string "gacela_" name))
+ (lisp-name (intern (string-upcase name))))
+ `(progn
+ (defcfun ,c-header 0 ,c-body)
+ (defentry ,lisp-name () (,type ,c-name))
+ (eval-when (load) (defconstant ,lisp-name (,lisp-name))))))
(clines "#include ")
(clines "#include ")
-(clines "#include ")
(clines "#include ")
-(clines "#include ")
;;; SDL constants as functions
(mapcconst int "int" "SDL_INIT_TIMER")
@@ -65,6 +76,7 @@
"SDL_Quit ();")
(defcfun "int gacela_SDL_SetVideoMode (int width, int height, int bpp, int flags)" 0
+ "close(2);"
"return SDL_SetVideoMode (width, height, bpp, flags);")
(defcfun "void gacela_SDL_WM_SetCaption (char *title, char *icon)" 0
@@ -130,12 +142,12 @@
(defcfun "int gacela_SDL_EnableKeyRepeat (int delay, int interval)" 0
"return SDL_EnableKeyRepeat (delay, interval);")
-(defcfun "int gacela_zoomSurface (int src, float zoomx, float zoomy, int smooth)" 0
- "return zoomSurface (src, zoomx, zoomy, smooth);")
-
(defcfun "int gacela_SDL_ByteOrder (void)" 0
"return SDL_BYTEORDER;")
+(defcfun "int gacela_zoomSurface (int src, double zoomx, double zoomy, int smooth)" 0
+ "return zoomSurface (src, zoomx, zoomy, smooth);")
+
(defentry SDL_Init (int) (int "gacela_SDL_Init"))
(defentry SDL_Quit () (void "gacela_SDL_Quit"))
(defentry SDL_SetVideoMode (int int int int) (int "gacela_SDL_SetVideoMode"))
@@ -175,8 +187,8 @@
;(defentry free (int) (void "gacela_free"))
(defentry SDL_GL_SwapBuffers () (void "gacela_SDL_GL_SwapBuffers"))
(defentry SDL_EnableKeyRepeat (int int) (int "gacela_SDL_EnableKeyRepeat"))
-(defentry zoomSurface (int float float int) (int "gacela_zoomSurface"))
(defentry SDL_ByteOrder () (int "gacela_SDL_ByteOrder"))
+(defentry zoomSurface (int double double int) (int "gacela_zoomSurface"))
;;; C-Gacela Functions
(defcfun "int gacela_surface_format (int surface)" 0
@@ -199,9 +211,16 @@
"const SDL_Surface *s = surface;"
"return s->format->BytesPerPixel;")
+(defcfun "int gacela_resize_surface (int surface, int width, int height)" 0
+ "const SDL_Surface *s = surface;"
+ "if (s->w == width && s->h == height) {"
+ " return s;"
+ "} else {"
+ " return zoomSurface (s, width / s->w, height / s->h, 0);"
+ "}")
+
;(defentry apply-surface2 (int int int int int int int int int) (void "apply_surface"))
;(defentry render-text2 (int string int int int) (int "render_text"))
-;(defentry fill-surface (int int int int) (void "fill_surface"))
;(defentry box-collision (int int int int int int) (int "box_collision"))
;(defentry create-SDL_Surface (int int int int int int) (int "create_SDL_Surface"))
;(defentry copy-SDL_Surface (int) (int "copy_SDL_Surface"))
@@ -210,3 +229,4 @@
(defentry surface-h (int) (int "gacela_surface_h"))
(defentry surface-pixels (int) (int "gacela_surface_pixels"))
(defentry surface-format-BytesPerPixel (int) (int "gacela_surface_format_BytesPerPixel"))
+(defentry resize-surface (int int int) (int "gacela_resize_surface"))