X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela.lisp;h=eecc4893ee41e5196887514e79932e302bb571d8;hb=4fe9bd9e78b0e3cee1133da2abcb05bc98322b31;hp=5cb515a136798f745a03e9ba27dcabab65cf0556;hpb=e1ff0e053ac905d71ed73cc7b0cefae3120cb0d1;p=gacela.git diff --git a/gacela.lisp b/gacela.lisp index 5cb515a..eecc489 100644 --- a/gacela.lisp +++ b/gacela.lisp @@ -66,23 +66,6 @@ (cond ((null screen) nil) (t (SDL_Flip screen)))) - (defun create-surface (width height &key (trans-color *transparent-color*)) - (init-video-mode) - (let ((new-surface (make-surface - :address (create-SDL_Surface - (surface-address screen) - width - height - (getf trans-color :red) - (getf trans-color :green) - (getf trans-color :blue))))) - (set-resource 'image new-surface (gentemp)) - new-surface)) - - (defun print-surface (x y surface) - (apply-surface x y surface screen) - surface) - (defun quit-video-mode () (setq screen nil))) @@ -98,18 +81,6 @@ (glHint GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST) t) -(defmacro progn-textures (&body code) - `(let (values) - (init-video-mode) - (glEnable GL_TEXTURE_2D) - (setq values (multiple-value-list (progn ,@code))) - (glDisable GL_TEXTURE_2D) - (apply #'values values))) - -(defun init-textures () - (init-video-mode) - (glEnable GL_TEXTURE_2D)) - (defun init-lighting () (init-video-mode) (glEnable GL_LIGHTING)) @@ -126,15 +97,13 @@ (glLoadIdentity) t)) -(defun copy-surface (source) - (cond ((surface-p source) - (let ((new-surface - (make-surface :address (copy-SDL_Surface (surface-address source)) - :clip-w (surface-clip-w source) - :clip-h (surface-clip-h source) - :shape (surface-shape source)))) - (set-resource 'image new-surface (gentemp)) - new-surface)))) +(let ((current-color '(1 1 1 1))) + (defun get-current-color () + current-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 load-image (image-file &key (transparent-color nil)) (init-video-mode) @@ -158,31 +127,6 @@ (lambda (x y) (print-surface x y address-image)) (lambda () (SDL_FreeSurface address-image))))) -(defun apply-surface (x y source destination) - (let ((offset (SDL_Rect x y 0 0))) - (SDL_BlitSurface source 0 destination offset) - (free offset) - destination)) - -(defun apply-surface-old (x y source destination &optional (clip nil)) - (cond ((null clip) - (apply-surface2 x y (surface-address source) (surface-address destination) 0 0 0 0 0)) - ((integerp clip) - (apply-surface2 x y (surface-address source) (surface-address destination) 0 0 - (surface-clip-w source) (surface-clip-h source) clip)) - (t - (apply-surface2 x y (surface-address source) (surface-address destination) - (first clip) (second clip) (third clip) (fourth clip) 0))) - destination) - - -(defun print-image (x y image-file &optional (clip nil)) - (init-video-mode) - (let ((image (load-image image-file))) - (print-surface x y image clip) - image)) - - (defun clean-screen () (fill-screen *background-color*)) @@ -192,56 +136,6 @@ (flip)) -;;; TTF Subsystem -(defstruct font address) - -(let ((ttf nil)) - - (defun init-ttf () - (cond ((null ttf) (progn (init-sdl) (setq ttf (TTF_Init)))) - (t ttf))) - - (defun quit-ttf () - (setq ttf (TTF_Quit)))) - - -(defun open-font (font-name tam) - (init-ttf) - (let ((font (get-resource 'font font-name tam))) - (if (null font) - (progn (setq font (make-font :address (TTF_OpenFont font-name tam))) - (set-resource 'font font font-name tam))) - font)) - - -(defun render-text (text-message - &key (color '(:red 255 :green 255 :blue 255)) - (font-name "lazy.ttf") (tam 28)) - (init-ttf) - (let ((message (get-resource 'text text-message color font-name tam))) - (if (null message) - (progn - (setq message - (make-surface - :address (render-text2 (open-font font-name tam) - text-message - (getf color :red) - (getf color :green) - (getf color :blue)))) - (set-resource 'text message text-message color font-name tam))) - message)) - - -(defun print-text (x y text-message - &key (color '(:red 255 :green 255 :blue 255)) - (font-name "lazy.ttf") (tam 28)) - (init-video-mode) - (init-ttf) - (let ((message (render-text text-message :color color :font-name font-name :tam tam))) - (print-surface x y message) - message)) - - ;;; Audio Subsystem (let ((audio nil)) @@ -254,44 +148,37 @@ ;;; Resources Manager -(defstruct resource address free-function object) +(defstruct resource plist constructor destructor time) + +(defun make-resource-texture (&key filename min-filter mag-filter) + `(:type texture :filename ,filename :min-filter ,min-filter :mag-filter ,mag-filter)) + +(defun make-resource-font (&key filename size encoding) + `(:type font :filename ,filename :size ,size :enconding ,encoding)) (let ((resources-table (make-hash-table :test 'equal))) - (defun set-resource (type object &rest key) - (let ((res - (cond ((surface-p object) - (make-resource :address (surface-address object) - :free-function #'SDL_FreeSurface - :object object)) - ((font-p object) - (make-resource :address (font-address object) - :free-function #'TTF_CloseFont - :object object)) - ((cp-space-p object) - (make-resource :address (cp-space-address object) - :free-function #'cpSpaceFree - :object object)) - ((cp-body-p object) - (make-resource :address (cp-body-address object) - :free-function #'cpBodyFree - :object object)) - ((cp-shape-p object) - (make-resource :address (cp-shape-address object) - :free-function #'cpShapeFree - :object object)) - (t nil)))) - (cond (res (setf (gethash `(,type ,@key) resources-table) res))))) - - (defun get-resource (type &rest key) - (let ((resource (gethash `(,type ,@key) resources-table))) + (defun set-resource (key plist constructor destructor &key static) + (setf (gethash key resources-table) + (make-resource :plist plist + :constructor constructor + :destructor destructor + :time (if static t (SDL_GetTicks))))) + + (defun get-resource (key) + (let ((resource (gethash key resources-table))) (cond ((null resource) nil) - (t (resource-object resource))))) + (t (cond ((/= (resource-time resource) -1) + (setf (resource-time resource) (SDL_GetTicks)) + (setf (gethash key resources-table) resource))) + (resource-plist resource))))) + + (defun free-resource (key) + (funcall (resource-destructor (gethash key resources-table))) + (setf (resource-time (gethash key resources-table)) nil)) (defun free-all-resources () - (maphash (lambda (key res) (funcall (resource-free-function res) (resource-address res))) - resources-table) - (clrhash resources-table))) + (maphash (lambda (key res) (free-resource key)) resources-table))) ;;; Connection with the GUI @@ -304,18 +191,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))) @@ -359,19 +234,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)