Meshes located at video module and new game loop procedure returning game elements

[gacela.git] / src / gacela.scm

diff --git a/src/gacela.scm b/src/gacela.scm
index 06986b8321737198920e44786781e5faeac358ad..e2be9a8c5091dd992a49420642b15ced35387927 100644 (file)
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -49,15 +49,15 @@
                   define-mob
                   lambda-mob
                   define-checking-mobs)
-  #:re-export (translate
-              get-frame-time
+  #:re-export (get-frame-time
               3d-mode?))
 
 
 ;;; Main Loop
 
-(define loop-flag #f)
+(define game-loop-flag #f)
 (define game-loop-thread #f)
+(define game-loop-procedure #f)
 
 (define-macro (run-in-game-loop proc)
   (let ((pgl (string->symbol (string-concatenate (list (symbol->string proc) "-in-game-loop"))))
@@ -87,47 +87,76 @@
 (run-in-game-loop resize-screen)
 
 (define-macro (game . code)
-  (if (null? code)
-      #f
-      `(call-with-new-thread (lambda () ,@code))))
+  `(set! game-loop-procedure
+    ,(if (null? code)
+        `#f
+        `(lambda (game-elements) ,@code))))
 
 (define (init-gacela)
-  (hide-all-mobs)
+;  (hide-all-mobs)
   (cond ((not game-loop-thread)
         (set! game-loop-thread (call-with-new-thread (lambda () (cond ((not (game-running?)) (game-loop))))))))
-  (while (not loop-flag))
+  (while (not game-loop-flag))
   #t)
 
 (define (quit-gacela)
-  (hide-all-mobs)
+;  (hide-all-mobs)
   (set! game-loop-thread #f)
-  (set! loop-flag #f))
+  (set! game-loop-flag #f)
+  (quit-video))
 
 (define (game-loop)
-  (refresh-active-mobs)
+;  (refresh-active-mobs)
   (init-video *width-screen* *height-screen* *bpp-screen* #:title *title* #:mode *mode* #:fps *frames-per-second*)
-  (set! loop-flag #t)
-  (while loop-flag
-        (init-frame-time)
+  (set! game-loop-flag #t)
+  (let loop ((game-elements '()))
+    (cond (game-loop-flag
+          (init-frame-time)
 ;          (check-connections)
-        (process-events)
-        (cond ((quit-signal?)
-               (quit-gacela))
-              (else
-               (clear-screen)
-               (to-origin)
-               (refresh-active-mobs)
-               (run-mobs)
-               (draw-meshes)
-               (flip-screen)
-               (delay-frame))))
-  (quit-video))
-
-(define (gacela-script args)
-  (while loop-flag (sleep 1)))
+          (process-events)
+          (cond ((quit-signal?)
+                 (quit-gacela))
+                (else
+                 (clear-screen)
+                 (to-origin)
+;                (refresh-active-mobs)
+;                (run-mobs)
+;                (run-extensions)
+                 (if game-loop-procedure
+                     (set! game-elements (game-loop-procedure game-elements)))
+                 (process-game-elements game-elements)
+                 (flip-screen)
+                 (delay-frame)
+                 (loop)))))))
 
 (define (game-running?)
-  loop-flag)
+  game-loop-flag)
+
+(define (process-game-elements elements)
+  (cond ((not (list? elements))
+        (process-game-elements (list elements)))
+       (else
+        (draw-meshes (filter (lambda (e) (mesh? e)) elements))
+)))
+
+;;; Extensions to main loop
+
+(define extensions '())
+
+(define (add-extension! proc pri)
+  "Add an extension with a priority to the main loop"
+  (set! extensions
+       (sort (assoc-set! extensions proc pri)
+             (lambda (a b)
+               (< (cdr a) (cdr b))))))
+
+(define (remove-extension! proc)
+  "Remove an extension from the main loop"
+  (set! extensions
+       (assoc-remove! extensions proc)))
+
+(define (run-extensions)
+  (for-each (lambda (x) ((car x))) extensions))
 
 
 ;;; Game Properties
@@ -338,18 +367,6 @@
      ,@body))
 
 
-;;; Views Factory
-
-(define default-view (make-hash-table))
-
-(define* (draw-meshes #:optional (meshes (hash-map->list (lambda (k v) v) default-view)))
-  (cond ((not (null? meshes))
-        (catch #t
-                 (lambda () (glmatrix-block ((car meshes))))
-                 (lambda (key . args) #f))
-        (draw-meshes (cdr meshes)))))
-
-
 (module-map (lambda (sym var)
              (if (not (eq? sym '%module-public-interface))
                  (module-export! (current-module) (list sym))))