From 43618642732145e7c20196ca1e79b498bc08f23b Mon Sep 17 00:00:00 2001
From: dxiao <dxiao@mit.edu>
Date: Mon, 8 Aug 2011 03:00:20 -0400
Subject: Leah's changes to tetris

---
 originaltetris/tetrisGUI.py | 88 ++++++++++++++-------------------------------
 1 file changed, 27 insertions(+), 61 deletions(-)

(limited to 'originaltetris/tetrisGUI.py')

diff --git a/originaltetris/tetrisGUI.py b/originaltetris/tetrisGUI.py
index 8085980..799dec3 100644
--- a/originaltetris/tetrisGUI.py
+++ b/originaltetris/tetrisGUI.py
@@ -3,6 +3,9 @@ This is the class you run to run tetris.
 Handles input and output
 """
 
+#make this more display-independent, yo.
+
+
 from Tkinter import *
 
 #GUI
@@ -18,8 +21,6 @@ class GUI( Frame ):
         self.max_x = max_x
         self.max_y = max_y
         self.offset = offset
-        #height = rows + one blank + score row
-        #width = left board + 4 blank + right board
         self.canvas = Canvas(parent,
                              height=((max_y+2) * scale)+offset,
                              width= 2*((max_x+2) * scale)+offset)
@@ -27,7 +28,6 @@ class GUI( Frame ):
         self.boardsize = ((max_x+4) * scale)+offset
         self.canvas.pack()
         
-        
     def add_block(self, (x, y), color):
         """
         Draw a block on the canvas
@@ -40,13 +40,20 @@ class GUI( Frame ):
         self.canvas.create_rectangle(
             rx, ry, rx+self.scale, ry+self.scale, fill=color
         )
-    """
-    def draw_board(self, color_dict):
+
+    def display_dict(self,d):
         self.canvas.delete(ALL)
-        #ARRAY or DICT...
-        for b in color_dict:
-            self.add_block(b)
-    """           
+        x_width = self.max_x*self.scale+3
+        y_width = self.max_y*self.scale+3
+        gap = 4*self.scale
+        self.canvas.create_rectangle(3,2,x_width, y_width)
+        self.canvas.create_rectangle(x_width+gap,2,2*x_width+gap-3, y_width)
+        for (x,y) in d:
+            color = d[(x,y)]
+            if x>self.max_x:
+                x+=4
+            self.add_block((x,y),color)
+        
     def draw_board(self, players):
         self.canvas.delete(ALL)
         x_width = self.max_x*self.scale+3
@@ -55,16 +62,17 @@ class GUI( Frame ):
         self.canvas.create_rectangle(3,2,x_width, y_width)
         self.canvas.create_rectangle(x_width+gap,2,2*x_width+gap-3, y_width)
         offset = 0
-        for p in players:
-            landed = p.board.landed
-            for b in landed:
-                self.add_block((b[0]+offset, b[1]), landed[b])
-            for b in p.shape.blocks:
-                self.add_block((b.x+offset, b.y), b.color)
-            offset += (self.max_x + 4)
-       
-        self.display_score(players[0].score,0)
-        self.display_score(players[1].score,1)
+        for n in range(2):
+            p = players[n]
+            if p:
+                offset = n*(self.max_x + 4)
+                landed = p.board.landed
+                for b in landed:
+                    self.add_block((b[0]+offset, b[1]), landed[b])
+                if p.shape:
+                    for b in p.shape.blocks:
+                        self.add_block((b.x+offset, b.y), b.color)
+                self.display_score(p.score,n)
 
     def display_score(self, score, player_num):
         offset = player_num * (self.max_x + 4)
@@ -76,45 +84,3 @@ class GUI( Frame ):
                 self.add_block(coord, "yellow")
             else:
                 self.add_block(coord, "gray")
-              
-"""   
-def update_display(player1,player2)
-    nah = process(meh)
-    #debug mode:
-    display_image(nah)
-    #real mode:
-    #update_lights(nah)
-    
-
-#waiting
-#press
-start = false
-while (!start)
-if (get_press(p0s)and p0_is_in) or (p1s and p1_is_in):
-    start = true
-if get_press(p0in):
-    game.add_player(0)
-if p1in:
-    game.add_player(1)
-
-animate countdown
-
-#assume 1p
-handle controls...
-p0.left()
-p0.right()
-etc
-
-get state...
-if p0.update()...
-    update_display(p0.board, p0.score)
-    
-if p0.died:
-    end
-
-animate end_seq(score)
-
-goto waiting
-
-
-"""
-- 
cgit v1.2.3