X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.scm;h=e2be9a8c5091dd992a49420642b15ced35387927;hb=bdc03bcc2da4d01745fb542d7a7d642b888b691e;hp=a0b9b22a137a4d8d958c9952ed880f18de61bf0a;hpb=bbfc49f49dedf5020c25426f276537fe0aa46771;p=gacela.git

diff --git a/src/gacela.scm b/src/gacela.scm
index a0b9b22..e2be9a8 100644
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -20,9 +20,7 @@
   #:use-module (gacela video)
   #:use-module (gacela audio)
   #:use-module (ice-9 optargs)
-  #:export (load-texture
-	    load-font
-	    *title*
+  #:export (*title*
 	    *width-screen*
 	    *height-screen*
 	    *bpp-screen*
@@ -33,55 +31,132 @@
 	    init-gacela
 	    quit-gacela
 	    game-loop
+	    gacela-script
 	    game-running?
-	    set-game-code)
-  #:export-syntax (game)
-  #:re-export (get-current-color
-	       set-current-color
-	       with-color
-	       progn-textures
-	       draw
-	       draw-texture
-	       draw-line
-	       draw-quad
-	       draw-rectangle
-	       draw-square
-	       draw-cube
-	       translate
-	       rotate
-	       to-origin
-	       add-light
-	       set-camera
-	       camera-look
-	       render-text))
-
-
-;;; Resources Cache
-
-(define resources-cache (make-weak-value-hash-table))
-
-(define (from-cache key)
-  (hash-ref resources-cache key))
-
-(define (into-cache key res)
-  (hash-set! resources-cache key res))
-
-(define-macro (use-cache-with module proc)
-  (let* ((pwc (string->symbol (string-concatenate (list (symbol->string proc) "-without-cache")))))
+	    show-mob-hash
+	    hide-mob-hash
+	    get-active-mobs
+	    hide-all-mobs
+	    get-current-mob-id
+	    get-mob-function-name
+	    map-mobs
+	    translate-mob)
+  #:export-syntax (game
+		   show-mob
+		   hide-mob
+		   the-mob
+		   define-mob-function
+		   define-mob
+		   lambda-mob
+		   define-checking-mobs)
+  #:re-export (get-frame-time
+	       3d-mode?))
+
+
+;;; Main Loop
+
+(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"))))
+	(flag-symbol (gensym))
+	(value-symbol (gensym)))
     `(begin
-       (define ,pwc (@ ,module ,proc))
+       (define ,pgl ,proc)
        (define (,proc . param)
-	 (let* ((key param)
-		(res (from-cache key)))
-	   (cond (res
-		  res)
+	 (cond ((and game-loop-thread (not (eq? game-loop-thread (current-thread))))
+		(let ((,flag-symbol #f))
+		  (define ,value-symbol)
+		  (system-async-mark
+		   (lambda ()
+		     (catch #t
+			   (lambda () (set! ,value-symbol (apply ,pgl param)))
+			   (lambda (key . args) #f))
+		     (set! ,flag-symbol #t))
+		   game-loop-thread)
+		  (while (not ,flag-symbol))
+		  ,value-symbol))
+	       (else
+		(apply ,pgl param)))))))
+
+(run-in-game-loop load-texture)
+(run-in-game-loop load-font)
+(run-in-game-loop set-screen-bpp!)
+(run-in-game-loop resize-screen)
+
+(define-macro (game . code)
+  `(set! game-loop-procedure
+    ,(if (null? code)
+	 `#f
+	 `(lambda (game-elements) ,@code))))
+
+(define (init-gacela)
+;  (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 game-loop-flag))
+  #t)
+
+(define (quit-gacela)
+;  (hide-all-mobs)
+  (set! game-loop-thread #f)
+  (set! game-loop-flag #f)
+  (quit-video))
+
+(define (game-loop)
+;  (refresh-active-mobs)
+  (init-video *width-screen* *height-screen* *bpp-screen* #:title *title* #:mode *mode* #:fps *frames-per-second*)
+  (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
-		  (set! res (apply ,pwc param))
-		  (into-cache key res)
-		  res)))))))
+		  (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?)
+  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))))))
 
-(use-cache-with (gacela video) load-texture)
-(use-cache-with (gacela video) load-font)
+(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
@@ -92,8 +167,9 @@
 (define *bpp-screen* 32)
 (define *frames-per-second* 20)
 (define *mode* '2d)
+(define *fullscreen* 'off)
 
-(define* (set-game-properties! #:key title width height bpp fps mode)
+(define* (set-game-properties! #:key title width height bpp fps mode fullscreen)
   (if title
       (set-screen-title! title))
   (if bpp
@@ -107,56 +183,191 @@
       (set-frames-per-second! fps))
   (if mode
       (if (eq? mode '3d) (set-3d-mode) (set-2d-mode)))
+  (if fullscreen
+      (set-fullscreen! fullscreen))
   (get-game-properties))
 
 (define (get-game-properties)
-  `((title . ,(get-screen-title)) (width . ,(get-screen-width)) (height . ,(get-screen-height)) (bpp . ,(get-screen-bpp)) (fps . ,(get-frames-per-second)) (mode . ,(if (3d-mode?) '3d '2d))))
+  `((title . ,(get-screen-title)) (width . ,(get-screen-width)) (height . ,(get-screen-height)) (bpp . ,(get-screen-bpp)) (fps . ,(get-frames-per-second)) (mode . ,(if (3d-mode?) '3d '2d)) (fullscreen . ,(get-fullscreen))))
 
 
-;;; Main Loop
+;;; Mobs Factory
 
-(define loop-flag #f)
-(define game-code #f)
+(define mobs-table (make-hash-table))
+(define active-mobs '())
+(define mobs-changed #f)
 
-(define-macro (game . code)
-  `(let ((game-function ,(if (null? code)
-			     `(lambda () #f)
-			     `(lambda () ,@code))))
-     (set-game-code game-function)
-     (cond ((not (game-running?))
-	    (game-loop)))))
+(define (show-mob-hash mob)
+  (hash-set! mobs-table (mob 'get-mob-id) mob)
+  (set! mobs-changed #t))
 
-(define (init-gacela)
-  (call-with-new-thread (lambda () (game))))
+(define (hide-mob-hash mob-id)
+  (hash-remove! mobs-table mob-id)
+  (set! mobs-changed #t))
 
-(define (quit-gacela)
-  (set! loop-flag #f))
+(define (refresh-active-mobs)
+  (cond (mobs-changed
+	 (set! mobs-changed #f)
+	 (set! active-mobs (hash-map->list (lambda (k v) v) mobs-table)))))
 
-(define (game-loop)
-;	  (refresh-active-mobs)
-  (set! loop-flag #t)
-  (init-video *width-screen* *height-screen* *bpp-screen* #:title *title* #:mode *mode* #:fps *frames-per-second*)
-  (while loop-flag
-	 (init-frame-time)
-;	    (check-connections)
-	 (process-events)
-	 (cond ((quit-signal?)
-		(quit-gacela))
-	       (else
-		(clear-screen)
-		(to-origin)
-;		   (refresh-active-mobs)
-		(if (procedure? game-code)
-		    (catch #t
-			   (lambda () (game-code))
-			   (lambda (key . args) #f)))
-;			  (run-mobs)
-		(flip-screen)
-		(delay-frame))))
-  (quit-video))
+(define (get-active-mobs)
+  active-mobs)
+
+(define (hide-all-mobs)
+  (set! mobs-changed #t)
+  (hash-clear! mobs-table))
+
+(define (mobs-changed?)
+  mobs-changed)
+
+
+(define-macro (show-mob mob)
+  (cond ((list? mob)
+	 `(let ((m ,mob))
+	    (show-mob-hash m)))
+	(else
+	 `(show-mob-hash (lambda* (#:optional (option #f)) (,mob option))))))
+
+(define-macro (hide-mob mob)
+  (cond ((list? mob)
+	 `(let ((m ,mob))
+	    (hide-mob-hash (m 'get-mob-id))))
+	(else
+	 `(hide-mob-hash (,mob 'get-mob-id)))))
+
+(define current-mob-id #f)
+
+(define translate-mob translate)
+
+(define (get-current-mob-id)
+  current-mob-id)
+
+(define* (run-mobs #:optional (mobs (get-active-mobs)))
+  (let ((sorted-mobs (sort mobs (lambda (m1 m2) (< (m1 'get-z-index) (m2 'get-z-index))))))
+    (for-each
+     (lambda (m)
+       (set! current-mob-id (m 'get-mob-id))
+       (glmatrix-block (m)))
+     sorted-mobs)
+    (set! current-mob-id #f)))
+
+
+;;; Making mobs
+
+(define mob-functions (make-hash-table))
+
+(define (get-mob-function-name mob-name)
+  (let ((name (hash-ref mob-functions mob-name)))
+    (cond ((not name)
+	   (set! name (gensym))
+	   (hash-set! mob-functions mob-name name)))
+    name))
+
+(define-macro (the-mob mob-name init-data)
+  `(let ((mob-id (gensym))
+	 (mob-z-index 0)
+	 (mob-time 0)
+	 (mob-data ,init-data)
+	 (saved-data ,init-data))
+     (lambda* (#:optional (option #f))
+       (define (save-data)
+	 (let ((time (get-frame-time)))
+	   (cond ((not (= time mob-time))
+		  (set! mob-time time)
+		  (set! saved-data mob-data)))))
+       (case option
+	 ((get-mob-id)
+	  mob-id)
+	 ((get-z-index)
+	  mob-z-index)
+	 ((get-type)
+	  (procedure-name ,mob-name))
+	 ((get-data)
+	  (save-data)
+	  saved-data)
+	 (else
+	  (cond ((keyword? option)
+		 (assoc-ref saved-data (keyword->symbol option)))
+		(else
+		 (save-data)
+		 (let ((res (,mob-name mob-id mob-data)))
+		   (set! mob-z-index (car res))
+		   (set! mob-data (cadr res))))))))))
+
+(define-macro (define-mob-function attr . body)
+  (let ((attr (map (lambda (a) (if (list? a) a (list a #f))) attr))
+	(mob-id-symbol (gensym))
+	(mob-id-z-index (gensym))
+	(data-symbol (gensym)))
+    `(lambda (,mob-id-symbol ,data-symbol)
+       (let ((,mob-id-z-index 0))
+	 (define (kill-me)
+	   (hide-mob-hash ,mob-id-symbol))
+	 (define* (translate x y #:optional (z 0))
+	   (cond ((3d-mode?)
+		  (translate-mob x y z))
+		 (else
+		  (set! ,mob-id-z-index (+ ,mob-id-z-index z))
+		  (translate-mob x y))))
+	 (let* ,attr
+	   ,@(map
+	      (lambda (a)
+		`(let ((val (assoc-ref ,data-symbol ',(car a))))
+		   (cond (val (set! ,(car a) val)))))
+	      attr)
+	   (catch #t
+		  (lambda* () ,@body)
+		  (lambda (key . args) #f))
+	   (list ,mob-id-z-index (list ,@(map (lambda (a) `(cons ',(car a) ,(car a))) attr))))))))
+
+(define-macro (define-mob mob-head . body)
+  (let* ((name (car mob-head))
+	 (attr (cdr mob-head))
+	 (make-fun-symbol (gensym))
+	 (mob-fun-symbol (gensym))
+	 (params-symbol (gensym)))
+    `(define (,name . ,params-symbol)
+       (define ,make-fun-symbol
+	 (lambda* ,(if (null? attr) '() `(#:key ,@attr))
+	   (the-mob ,name (list ,@(map (lambda (a) `(cons ',(car a) ,(car a))) attr)))))
+       (define ,mob-fun-symbol
+	 (define-mob-function ,attr ,@body))
+       (cond ((or (null? ,params-symbol) (keyword? (car ,params-symbol)))
+	      (apply ,make-fun-symbol ,params-symbol))
+	     (else
+	      (apply ,mob-fun-symbol ,params-symbol))))))
+
+(define-macro (lambda-mob attr . body)
+  (let ((fun-name (gensym)))
+    `(begin
+       (define-mob-function ,(cons fun-name attr) ,@body)
+       (the-mob 'undefined '() ,fun-name))))
+
+
+;;; Functions for checking mobs (collisions and more)
+
+(define (map-mobs fun type)
+  (let ((mobs (filter (lambda (m) (and (eq? (m 'get-type) type) (not (eq? (m 'get-mob-id) (get-current-mob-id))))) (get-active-mobs))))
+    (map (lambda (m) (fun (m 'get-data))) mobs)))
+
+(define-macro (define-checking-mobs head mob-def . body)
+  (let ((type (car mob-def)) (attr (cdr mob-def)))
+    `(define ,head
+       (map-mobs
+	(lambda (m)
+	  (let ,(map (lambda (a) `(,(car a) (assoc-ref m ',(cadr a)))) attr)
+	    ,@body))
+	',type))))
+
+
+;;; Scenes
+
+(define-macro (define-scene name . body)
+  `(define (,name)
+     ,@body))
 
-(define (game-running?)
-  loop-flag)
 
-(define (set-game-code game-function)
-  (set! game-code game-function))
+(module-map (lambda (sym var)
+	      (if (not (eq? sym '%module-public-interface))
+		  (module-export! (current-module) (list sym))))
+	    (current-module))