X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_tetris.lisp;h=aadcb5238005f568d2f98155cd512e1fd9ee177b;hb=313f0f55db1767306751807b41bf3ca125909ea0;hp=c0e7a382e866129d606ac1e65a6872fabf865d93;hpb=0e67e98bfd1eedf78f3e9c27a6d9726f225deac1;p=gacela.git

diff --git a/gacela_tetris.lisp b/gacela_tetris.lisp
index c0e7a38..aadcb52 100644
--- a/gacela_tetris.lisp
+++ b/gacela_tetris.lisp
@@ -1,6 +1,6 @@
 (in-package :gacela)
 
-(setq *zoom* -10)
+(set-frames-per-second 15)
 
 (defun tetramine-i ()
   (let ((color '(1 0 0)))
@@ -48,13 +48,13 @@
 
 (defun draw-cell (cell)
   (cond ((null cell) nil)
-	(t (draw-color cell) (draw-square :size 0.9))))
+	(t (with-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)
@@ -99,11 +99,16 @@
 			 (t (fill (cons (make-list 14) grid) (- n 1))))))
 	    (fill res (- 20 (length res))))))
 
+(let ((points 0))
+  (defun get-points ()
+    points))
+
 (let ((tetramine (random-tetramine)) (x 6) (y 0)
       (next (random-tetramine))
       (timer (make-timer))
       (grid (make-list 20 :initial-element (make-list 14)))
-      (texture (load-texture "background.bmp")));fondo_tetris.png")))
+      (background (draw-image-function "fondo_tetris.png"))
+      (font (load-font "lazy.ttf" :size 20)))
   (defun tetramine ()
     (cond ((eq (timer-state timer) 'stopped) (start-timer timer)))
 
@@ -128,11 +133,17 @@
 		  (setq tetramine next x 6 y 0)
 		  (setq next (random-tetramine)))
 		 (t (incf y) (start-timer timer)))))
-
-    (draw-square :size 1 :texture texture)))
-;    (translate -25 19)
-;    (draw-grid (join-grids tetramine grid x y))
-;    (translate 40 40)
-;    (draw-grid next)))
-
-(run-game "Gacela Tetris" (tetramine))
+    (funcall background)
+    (translate -288 218)
+    (draw-grid (join-grids tetramine grid x y))
+    (translate 440 440)
+    (draw-grid next)
+    (render-text "Hola" font)))
+
+(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)))))