(no commit message)

[gacela.git] / gacela.lisp

diff --git a/gacela.lisp b/gacela.lisp
index b9b415a0b711121da8cb8dcea11faf2a75194669..a7045cee8dfa718a17c0ff5eedfd9e9d7d69a40c 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -15,7 +15,7 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(in-package :gacela)
+(in-package :gacela :nicknames '(gg))
 
 ;;; Default values for Gacela
 (defvar *width-screen* 640)
@@ -86,16 +86,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))
+  (cond ((3d-mode?) (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)))
+       (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 ()
@@ -204,30 +204,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 +231,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))