(no commit message)

diff --git a/gacela.lisp b/gacela.lisp
index 73bc8804fe93f710ba689cc39cdf88929189bfa5..955cbc3628a9824256a6590ab3d3a379b814bb49 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -21,10 +21,7 @@
 (defvar *width-screen* 640)
 (defvar *height-screen* 480)
 (defvar *bpp-screen* 32)
 (defvar *width-screen* 640)
 (defvar *height-screen* 480)
 (defvar *bpp-screen* 32)

-(defvar *title-screen* "Happy Hacking!!")

 (defvar *frames-per-second* 20)
 (defvar *frames-per-second* 20)

-(defvar *transparent-color* '(:red 0 :green 0 :blue 0))
-(defvar *background-color* '(:red 0 :green 0 :blue 0))

 
 ;;; SDL Initialization Subsystem
 (let (initialized)
 
 ;;; SDL Initialization Subsystem
 (let (initialized)


@@ -38,7 +35,7 @@
 
 
 ;;; Video Subsystem
 
 
 ;;; Video Subsystem

-(let (screen flags current-width current-height)
+(let (screen flags current-width current-height current-bpp)

 
   (defun init-video-mode (&key (width *width-screen*) (height *height-screen*) (bpp *bpp-screen*))
     (cond ((null screen)
 
   (defun init-video-mode (&key (width *width-screen*) (height *height-screen*) (bpp *bpp-screen*))
     (cond ((null screen)


@@ -50,10 +47,10 @@
           (setq screen (SDL_SetVideoMode width height bpp flags))
           (init-GL)
           (resize-screen-GL width height)
           (setq screen (SDL_SetVideoMode width height bpp flags))
           (init-GL)
           (resize-screen-GL width height)

-          (setq current-width width current-height height))
+          (setq current-width width current-height height current-bpp bpp))

          (t t)))
 
          (t t)))
 

-  (defun resize-screen (width height bpp)
+  (defun resize-screen (width height &optional (bpp current-bpp))

     (setq screen (SDL_SetVideoMode width height bpp flags))
     (resize-screen-GL width height)
     (setq current-width width current-height height))
     (setq screen (SDL_SetVideoMode width height bpp flags))
     (resize-screen-GL width height)
     (setq current-width width current-height height))


@@ -61,10 +58,6 @@
   (defun apply-mode-change ()
     (resize-screen-GL current-width current-height))
 
   (defun apply-mode-change ()
     (resize-screen-GL current-width current-height))
 

-  (defun fill-screen (color)
-    (init-video-mode)
-    (fill-surface screen (getf color :red) (getf color :green) (getf color :blue)))
-

   (defun quit-video-mode ()
     (setq screen nil)))
 
   (defun quit-video-mode ()
     (setq screen nil)))
 


@@ -207,15 +200,15 @@
     (maphash (lambda (key res) (free-resource key)) resources-table)))
 
 
     (maphash (lambda (key res) (free-resource key)) resources-table)))
 
 

-;;; Connection with Gacela Skin Clients
+;;; Connection with Gacela Clients

 (let (server-socket clients)
 (let (server-socket clients)

-  (defun start-skin-server (port)
-    (cond ((null server-socket) (setq server-socket (si::socket port :server #'check-skin-connections)))))
+  (defun start-server (port)
+    (cond ((null server-socket) (setq server-socket (si::socket port :server #'check-connections)))))

 
 

-  (defun check-skin-connections ()
+  (defun check-connections ()

     (cond ((and server-socket (listen server-socket)) (setq clients (cons (si::accept server-socket) clients)))))
 
     (cond ((and server-socket (listen server-socket)) (setq clients (cons (si::accept server-socket) clients)))))
 

-  (defun eval-from-skin ()
+  (defun eval-from-clients ()

     (labels ((eval-clients (cli-socks)
                           (cond (cli-socks
                                  (let ((cli (car cli-socks)))
     (labels ((eval-clients (cli-socks)
                           (cond (cli-socks
                                  (let ((cli (car cli-socks)))


@@ -227,7 +220,7 @@
                                           (cons cli (eval-clients (cdr cli-socks))))))))))
            (setq clients (eval-clients clients))))
 
                                           (cons cli (eval-clients (cdr cli-socks))))))))))
            (setq clients (eval-clients clients))))
 

-  (defun stop-skin-server ()
+  (defun stop-server ()

     (cond (server-socket (si::close server-socket) (setq server-socket nil)))
     (cond (clients
           (labels ((close-clients (cli-socks)
     (cond (server-socket (si::close server-socket) (setq server-socket nil)))
     (cond (clients
           (labels ((close-clients (cli-socks)


@@ -271,8 +264,8 @@
        (SDL_GL_SwapBuffers)
        (delay-frame)
        (init-frame-time)
        (SDL_GL_SwapBuffers)
        (delay-frame)
        (init-frame-time)

-       (check-skin-connections)
-       (eval-from-skin)
+       (check-connections)
+       (eval-from-clients)

        (process-events))
     (setq running nil))
 
        (process-events))
     (setq running nil))
 

diff --git a/gacela_SDL.lisp b/gacela_SDL.lisp
index 6f3376e716fa385aeb34c0dc2404fd7ae8733bdd..da02a84033c2e2752dd57fde05a856028dc2cbf4 100644 (file)
--- a/gacela_SDL.lisp
+++ b/gacela_SDL.lisp
@@ -205,7 +205,6 @@
 
 ;(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 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"))
 ;(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"))