[pypy-svn] r62645 - in pypy/trunk/pypy/lang/gameboy: . test

[tverwaes at codespeak.net]

Author: tverwaes
Date: Fri Mar  6 15:15:18 2009
New Revision: 62645

Modified:
   pypy/trunk/pypy/lang/gameboy/gameboy_implementation.py
   pypy/trunk/pypy/lang/gameboy/test/test_video_sprite.py
   pypy/trunk/pypy/lang/gameboy/video.py
   pypy/trunk/pypy/lang/gameboy/video_meta.py
   pypy/trunk/pypy/lang/gameboy/video_sprite.py
Log:
fixing tests


Modified: pypy/trunk/pypy/lang/gameboy/gameboy_implementation.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/gameboy_implementation.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/gameboy_implementation.py	Fri Mar  6 15:15:18 2009
@@ -112,7 +112,6 @@
     def __init__(self, gameboy):
         VideoDriver.__init__(self)
 
-        self.create_pixels()
         if show_metadata:
             self.create_meta_windows(gameboy)
         self.create_screen()

Modified: pypy/trunk/pypy/lang/gameboy/test/test_video_sprite.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/test/test_video_sprite.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/test/test_video_sprite.py	Fri Mar  6 15:15:18 2009
@@ -136,12 +136,12 @@
     
 def line_intersection_test(sprite):
     sprite.video.line_y = 0
-    assert not sprite.intersects_current_line()
+    assert not sprite.intersects_current_line(sprite.video.line_y)
     for i in range(sprite.get_height()):
         sprite.video.line_y = i+1
-        assert sprite.intersects_current_line(), i
+        assert sprite.intersects_current_line(sprite.video.line_y), i
     sprite.video.line_y = sprite.get_height()+1
-    assert not sprite.intersects_current_line()
+    assert not sprite.intersects_current_line(sprite.video.line_y)
     
     
 # test sprite in video ---------------------------------------------------------

Modified: pypy/trunk/pypy/lang/gameboy/video.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/video.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/video.py	Fri Mar  6 15:15:18 2009
@@ -546,6 +546,7 @@
     def __init__(self):
         self.width  = GAMEBOY_SCREEN_WIDTH
         self.height = GAMEBOY_SCREEN_HEIGHT
+        self.create_pixels()
 
     def clear_gb_pixels(self):
         for y in range(GAMEBOY_SCREEN_HEIGHT):
@@ -558,6 +559,10 @@
     def update_gb_display(self):
         self.update_display()
 
+    def update_display(self):
+        # Overwrite this method to actually put the pixels on a screen.
+        pass
+
     def create_pixels(self):
         self.pixels = [[0] * self.width
                         for i in range(self.height)]

Modified: pypy/trunk/pypy/lang/gameboy/video_meta.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/video_meta.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/video_meta.py	Fri Mar  6 15:15:18 2009
@@ -70,6 +70,23 @@
             line = self.screen[y]
             self.gameboy.video.draw_window(self.get_window(), y, line)
 
+class MapViewer(VideoMetaWindow):
+    def __init__(self, gameboy):
+        self.map_x = 32
+        self.map_y = 32
+        VideoMetaWindow.__init__(self, gameboy,
+                                       SPRITE_SIZE + GAMEBOY_SCREEN_WIDTH + SPRITE_SIZE,
+                                       GAMEBOY_SCREEN_HEIGHT)
+
+    def get_window(self):
+        raise Exception("Not Implemented")
+
+    def update_screen(self):
+        for y in range(self.height):
+            line = self.screen[y]
+            self.gameboy.video.draw_window(self.get_window(), y, line)
+
+
 class WindowPreview(PreviewWindow):
     def get_window(self):
         # XXX Broken for now

Modified: pypy/trunk/pypy/lang/gameboy/video_sprite.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/video_sprite.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/video_sprite.py	Fri Mar  6 15:15:18 2009
@@ -130,9 +130,9 @@
         value += self.rest_attributes_and_flags
         return value
     
-    # Unused.
-    #def get_width(self):
-    #    return SPRITE_SIZE
+    # For testing purposes only
+    def get_width(self):
+        return SPRITE_SIZE
     
     def get_height(self):
         if self.big_size: