X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_tetris.lisp;h=6a0242f6271305034fcbce2460ee677fc381400a;hb=357aa6f62c04d59385ac4e44a5303d0825aa81ba;hp=4bd3819dd3f1c2fe1ee2371a9644db0be450fbac;hpb=1f3c099ac8e547fa510085b935d691f24e3940dd;p=gacela.git

diff --git a/gacela_tetris.lisp b/gacela_tetris.lisp
index 4bd3819..6a0242f 100644
--- a/gacela_tetris.lisp
+++ b/gacela_tetris.lisp
@@ -1,7 +1,5 @@
 (in-package :gacela)
 
-(setq *zoom* -50)
-
 (defun tetramine-i ()
   (let ((color '(1 0 0)))
     `((,color ,color ,color ,color))))
@@ -48,13 +46,13 @@
 
 (defun draw-cell (cell)
   (cond ((null cell) nil)
-	(t (draw-color cell) (draw-square :size 0.9))))
+	(t (draw-color cell) (draw-square :size 20))))
 
 (defun draw-row (row)
-  (mapcar (lambda (cell) (draw-cell cell) (translate 2 0)) row))
+  (mapcar (lambda (cell) (draw-cell cell) (translate 23 0)) row))
 
 (defun draw-grid (grid)
-  (mapcar (lambda (row) (draw-row row) (translate (* -2 (length row)) -2)) grid))
+  (mapcar (lambda (row) (draw-row row) (translate (* -23 (length row)) -23)) grid))
 
 (defun join-rows (source destination &optional (offset 0))
   (cond ((null source) destination)
@@ -103,7 +101,7 @@
       (next (random-tetramine))
       (timer (make-timer))
       (grid (make-list 20 :initial-element (make-list 14)))
-      (texture (load-texture "fondo_tetris.png")))
+      (background (draw-image-function "fondo_tetris.png")))
   (defun tetramine ()
     (cond ((eq (timer-state timer) 'stopped) (start-timer timer)))
 
@@ -129,10 +127,17 @@
 		  (setq next (random-tetramine)))
 		 (t (incf y) (start-timer timer)))))
 
-    (draw-square :size 20 :texture texture)))
-;    (translate -25 19)
+;    (draw-square :size 200)))
+    (funcall background)))
+;    (translate -288 218)
 ;    (draw-grid (join-grids tetramine grid x y))
-;    (translate 40 40)
+;    (translate 440 440)
 ;    (draw-grid next)))
 
-(run-game "Gacela Tetris" (tetramine))
+(let ((frame 0.0) (fps (make-timer)) (update (make-timer)))
+  (start-timer update)
+  (start-timer fps)
+  (run-game "Gacela Tetris"
+	    (tetramine)
+	    (incf frame)
+	    (cond ((> (get-time update) 1000) (print (/ frame (/ (get-time fps) 1000.0))) (start-timer update)))))