X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela.lisp;h=b5d611dabe09af9e1eaea50368bf46ab0a565b37;hb=15dc6f156f90086f1f82655b43183f0d8647fa0e;hp=b9b415a0b711121da8cb8dcea11faf2a75194669;hpb=57a2b49670c77a435b67d19fed2d4ea80e5d2a3f;p=gacela.git diff --git a/gacela.lisp b/gacela.lisp index b9b415a..b5d611d 100644 --- a/gacela.lisp +++ b/gacela.lisp @@ -15,7 +15,7 @@ ;;; along with this program. If not, see . -(in-package :gacela) +(in-package :gacela :nicknames '(gg)) ;;; Default values for Gacela (defvar *width-screen* 640) @@ -38,9 +38,7 @@ ;;; Video Subsystem -(defstruct surface address clip-w clip-h shape) - -(let (screen flags) +(let (screen flags current-width current-height) (defun init-video-mode (&key (width *width-screen*) (height *height-screen*) (bpp *bpp-screen*)) (cond ((null screen) @@ -51,12 +49,17 @@ (if (= (getf (SDL_GetVideoInfo) :blit_hw) 0) 0 SDL_HWACCEL))) (setq screen (SDL_SetVideoMode width height bpp flags)) (init-GL) - (resize-screen-GL width height)) + (resize-screen-GL width height) + (setq current-width width current-height height)) (t t))) (defun resize-screen (width height bpp) (setq screen (SDL_SetVideoMode width height bpp flags)) - (resize-screen-GL width height)) + (resize-screen-GL width height) + (setq current-width width current-height height)) + + (defun apply-mode-change () + (resize-screen-GL current-width current-height)) (defun fill-screen (color) (init-video-mode) @@ -69,9 +72,25 @@ (defun quit-video-mode () (setq screen nil))) +(let ((mode '2d)) + (defun set-2d-mode () + (cond ((3d-mode?) + (setq mode '2d) + (init-video-mode) + (glDisable GL_DEPTH_TEST) + (apply-mode-change)))) + + (defun set-3d-mode () + (cond ((not (3d-mode?)) + (setq mode '3d) + (init-video-mode) + (glEnable GL_DEPTH_TEST) + (apply-mode-change)))) + + (defun 3d-mode? () + (eq mode '3d))) (defun init-GL () - (2d-mode) (glShadeModel GL_SMOOTH) (glClearColor 0 0 0 0) (glClearDepth 1) @@ -86,16 +105,16 @@ (glEnable GL_LIGHTING)) (defun resize-screen-GL (width height) - (let ((ratio (if (= height 0) width (/ width height)))) -; (glViewPort 0 0 width height) - (glMatrixMode GL_PROJECTION) - (glLoadIdentity) - (let* ((w (/ width 2)) (-w (neg w)) (h (/ height 2)) (-h (neg h))) - (glOrtho -w w -h h 0 1)) -; (gluPerspective 45 ratio 0.1 100) - (glMatrixMode GL_MODELVIEW) - (glLoadIdentity) - t)) + (glViewPort 0 0 width height) + (glMatrixMode GL_PROJECTION) + (glLoadIdentity) + (cond ((3d-mode?) (let ((ratio (if (= height 0) width (/ width height)))) + (gluPerspective 45 ratio 0.1 100))) ;0.1 + (t (let* ((w (/ width 2)) (-w (neg w)) (h (/ height 2)) (-h (neg h))) + (glOrtho -w w -h h 0 1)))) + (glMatrixMode GL_MODELVIEW) + (glLoadIdentity) + t)) (let ((current-color '(1 1 1 1))) (defun get-current-color () @@ -121,20 +140,6 @@ (caddr transparent-color))) optimized-image))))))) -(defun load-image2 (image-file &key (transparent-color nil)) - (let ((address-image (load-image image-file :transparent-color transparent-color))) - (list - (lambda (x y) (print-surface x y address-image)) - (lambda () (SDL_FreeSurface address-image))))) - -(defun clean-screen () - (fill-screen *background-color*)) - -(defun refresh-screen () - (clean-screen) - (funcall-procs #'print-mob) - (flip)) - ;;; Audio Subsystem (let ((audio nil)) @@ -204,30 +209,22 @@ (maphash (lambda (key res) (free-resource key)) resources-table))) -;;; Connection with the GUI +;;; Connection with Gacela Skin (let (socket) - (defun connect-to-gui () - (setq socket (si::socket 1984 :host "localhost"))) + (defun start-skin-client (port) + (when (null socket) (setq socket (si::socket port :host "localhost")))) - (defun eval-from-gui () - (cond ((and socket (listen socket)) (eval (read socket)))))) + (defun eval-from-skin () + (when (si::listen socket) + (secure-block socket (eval (read socket))))) + (defun stop-skin-client () + (when socket + (si::close socket) + (setq socket nil)))) -;;; GaCeLa Functions -(let (commands) - (defun prog-command (command) - (setq commands (cons command commands))) - - (defun run-commands () - (cond (commands - (let (running) - (setq running commands) - (setq commands nil) - (labels ((run-com (comlst) - (cond (comlst (run-com (cdr comlst)) - (eval (read-from-string (concatenate 'string "(progn " (car comlst) ")"))))))) - (run-com running))))))) +;;; GaCeLa Functions (let (time (time-per-frame (/ 1000.0 *frames-per-second*))) (defun set-frames-per-second (fps) (setq time-per-frame (/ 1000.0 fps))) @@ -239,29 +236,43 @@ (let ((frame-time (- (SDL_GetTicks) time))) (cond ((< frame-time time-per-frame) (SDL_Delay (- time-per-frame frame-time))))))) - + (defmacro run-game (title &body code) - `(progn + `(let ((game-function (lambda () ,@code))) (init-video-mode) (SDL_WM_SetCaption ,title "") - (init-frame-time) - (process-events) - (do () ((quit?)) - (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT)) - (glLoadIdentity) - ,@code - (SDL_GL_SwapBuffers) - (delay-frame) - (init-frame-time) - (process-events) - (setq running nil)))) + (set-game-code game-function) + (cond ((not (game-running?)) + (init-frame-time) + (process-events) + (game-loop))))) + +(let (running game-code) + (defun game-loop () + (setq running t) + (do () ((quit?)) + (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT)) + (glLoadIdentity) + (when (functionp game-code) (funcall game-code)) + (SDL_GL_SwapBuffers) + (delay-frame) + (init-frame-time) + (eval-from-skin) + (process-events)) + (setq running nil)) + + (defun game-running? () + running) + + (defun set-game-code (game-function) + (setq game-code game-function))) (defun quit-game () (free-all-resources) ; (quit-audio) (quit-video-mode) -; (quit-all-procs) + (quit-all-mobs) ; (clear-events) ; (quit-events) (quit-sdl))