X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.scm;h=3b65aff208d01470b6954ef2166c9096e8b11649;hb=22e3dfd1d4f268023ee5c0351eb25e409520004a;hp=d6515ec2f45ae3e38a377fae2f59502738962e6c;hpb=739e884086c71d990d35939d2006a5b04c39fefb;p=gacela.git

diff --git a/src/gacela.scm b/src/gacela.scm
index d6515ec..3b65aff 100644
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -1,5 +1,5 @@
 ;;; Gacela, a GNU Guile extension for fast games development
-;;; Copyright (C) 2009 by Javier Sancho Fernandez <jsf at jsancho dot org>
+;;; Copyright (C) 2013 by Javier Sancho Fernandez <jsf at jsancho dot org>
 ;;;
 ;;; This program is free software: you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -16,155 +16,50 @@
 
 
 (define-module (gacela gacela)
-  #:use-module (gacela events)
-  #:use-module (gacela video)
-  #:use-module (gacela audio)
-  #:use-module (ice-9 optargs)
-  #:export (load-texture
-	    load-font
-	    init-gacela
-	    quit-gacela
-	    game-loop
-	    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))
+  #:use-module (gacela system)
+  #:use-module (ice-9 threads)
+  #:use-module (srfi srfi-1)
+  #:export (make-world))
 
 
-;;; Default values for Gacela
+;;; Entities and components
 
-(define *title* "Gacela")
-(define *width-screen* 640)
-(define *height-screen* 480)
-(define *bpp-screen* 32)
-(define *frames-per-second* 20)
-(define *mode* '2d)
+(define (make-world . entities)
+  (apply make-entity-set entities))
 
+(define entities-mutex (make-mutex))
+(define game-entities '())
+(define game-components '())
 
-;;; Resources Cache
 
-(define resources-cache (make-weak-value-hash-table))
+(define (entity . components)
+  (with-mutex entities-mutex
+   (let ((key (gensym)))
+     (set! game-entities
+	   (acons key
+		  (map (lambda (c) (list (get-component-type c) c)) components)
+		  game-entities))
+     (set! game-components (register-components key components))
+     key)))
 
-(define (from-cache key)
-  (hash-ref resources-cache key))
 
-(define (into-cache key res)
-  (hash-set! resources-cache key res))
+(define* (register-components entity components #:optional (clist game-components))
+  (cond ((null? components) clist)
+	(else
+	 (let* ((type (get-component-type (car components)))
+		(elist (assoc-ref clist type)))
+	   (register-components entity (cdr components)
+	     (assoc-set! clist type
+	       (cond (elist
+		      (lset-adjoin eq? elist entity))
+		     (else
+		      (list entity)))))))))
 
-(define-macro (use-cache-with module proc)
-  (let* ((pwc (string->symbol (string-concatenate (list (symbol->string proc) "-without-cache")))))
-    `(begin
-       (define ,pwc (@ ,module ,proc))
-       (define (,proc . param)
-	 (let* ((key param)
-		(res (from-cache key)))
-	   (cond (res
-		  res)
-		 (else
-		  (set! res (apply ,pwc param))
-		  (into-cache key res)
-		  res)))))))
 
-(use-cache-with (gacela video) load-texture)
-(use-cache-with (gacela video) load-font)
+(define (get-entity key)
+  (with-mutex entities-mutex
+   (assoc key game-entities)))
 
 
-;;; Game Properties
-
-(define set-game-properties! #f)
-(define get-game-properties #f)
-
-;; (let ((ptitle *title*) (pwidth *width-screen*) (pheight *height-screen*) (pbpp *bpp-screen*) (pfps *frames-per-second*) (pmode *mode*))
-;;   (set! set-game-properties!
-;; 	(lambda* (#:key title width height bpp fps mode)
-;; ;	  (init-video-mode)
-;; 	  (if title
-;; 	      (begin
-;; 		(set! ptitle title)
-;; 		(if (video-mode-on?) (SDL_WM_SetCaption title ""))))
-;; 	  (if (or width height bpp)
-;; 	      (begin
-;; 		(if width (set! pwidth width))
-;; 		(if height (set! pheight height))
-;; 		(if bpp (set! pbpp bpp))
-;; 		(if (video-mode-on?) (resize-screen pwidth pheight pbpp))))
-;; 	  (if fps
-;; 	      (begin
-;; 		(set! pfps fps)
-;; 		(set-frames-per-second fps)))
-;; 	  (if mode
-;; 	      (begin
-;; 		(set! pmode mode)
-;; 		(if (video-mode-on?)
-;; 		    (if (eq? mode '3d) (set-3d-mode) (set-2d-mode)))))
-;; 	  (get-game-properties)))
-
-;;   (set! get-game-properties
-;; 	(lambda ()
-;; 	  `((title . ,ptitle) (width . ,pwidth) (height . ,pheight) (bpp . ,pbpp) (fps . ,pfps) (mode . ,pmode)))))
-
-
-;;; Main Loop
-
-(define loop-flag #f)
-(define game-code #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 (init-gacela)
-  (call-with-new-thread (lambda () (game))))
-
-(define (quit-gacela)
-  (set! loop-flag #f))
-
-(define (game-loop)
-;	  (refresh-active-mobs)
-  (set! loop-flag #t)
-  (init-video 640 480 32)
-;	  (quit! #f)
-  (while loop-flag
-;	    (init-frame-time)
-;	    (check-connections)
-	 (process-events)
-	 (cond ((not (quit?))
-		(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 (game-running?)
-  loop-flag)
-
-(define (set-game-code game-function)
-  (set! game-code game-function))
+(export entity
+	get-entity)