merged newer surface and tests that can blit.

Author: XenGi

pymlgame/surface.py

@@ -86,7 +86,8 @@ def draw_rect(self, pos, size, color, fillcolor=None, brightness=0.1):
 
     def draw_circle(self, pos, radius, color, fillcolor=None, brightness=0.1):
         """
-        Draw a circle with the given color on the screen and optionally fill it with fillcolor.
+        Draw a circle with the given color on the screen and optionally fill it
+        with fillcolor.
         """
         #TODO: This still produces rubbish but it's on a good way to success
         def dist(d, p, r):
@@ -107,6 +108,26 @@ def dist(d, p, r):
         for point in points:
             self.draw_dot(point, color, brightness)
 
+    def blit(self, surface, pos=(0, 0)):
+        """
+        Blits a surface on this surface at pos
+        """
+        for x in range(surface.width):
+            for y in range(surface.height):
+                px = x + pos[0]
+                py = y + pos[1]
+                if 0 < px < self.width and 0 < py < self.height:
+                    self.matrix[px][py] = surface.matrix[x][y]
+
+    def replace_color(self, before, after):
+        """
+        Replaces a color on a surface with another one.
+        """
+        for x in range(self.width):
+            for y in range(self.height):
+                if self.matrix[x][y] == before:
+                    self.matrix[x][y] = after
+
     @staticmethod
     def get_color(color, brightness=0.1):
         """

tests.py

@@ -68,14 +68,16 @@ def test_update(self):
         pass
 
     def test_blit(self):
-        surface = pymlgame.Surface(int(TEST_WIDTH / 2), int(TEST_HEIGHT / 2))
-        surface.fill(pymlgame.WHITE)
-        self.screen.blit(surface, (0, 0))
+        surface = pymlgame.Surface(TEST_WIDTH - 2, TEST_HEIGHT - 2)
+        surface.fill(pymlgame.WHITE, 1.0)
+        self.screen.blit(surface, (1, 1))
 
-        self.assertEqual(self.screen.matrix[int(TEST_WIDTH / 2 - 1)][int(TEST_HEIGHT / 2 - 1)],
-                         surface.get_color(pymlgame.WHITE, 0.1))
-        self.assertEqual(self.screen.matrix[int(TEST_WIDTH / 2)][int(TEST_HEIGHT / 2)],
-                         surface.get_color(pymlgame.BLACK, 0.1))
+        for x in range(TEST_WIDTH):
+            for y in range(TEST_HEIGHT):
+                if 0 < x < TEST_WIDTH - 1 and 0 < y < TEST_HEIGHT - 1:
+                    self.assertEqual(self.screen.matrix[x][y], pymlgame.WHITE)
+                else:
+                    self.assertEqual(self.screen.matrix[x][y], pymlgame.BLACK)
 
     def test_point_on_screen(self):
         self.assertTrue(self.screen.point_on_screen((0, 0)))
@@ -180,6 +182,18 @@ def test_draw_circle(self):
         radius = int(min(TEST_WIDTH, TEST_HEIGHT) / 2) - 2
         self.surface.draw_circle(pos, radius, pymlgame.GREEN, None, 1.0)
 
+    def test_blit(self):
+        surface = pymlgame.Surface(TEST_WIDTH - 2, TEST_HEIGHT - 2)
+        surface.fill(pymlgame.WHITE, 1.0)
+        self.surface.blit(surface, (1, 1))
+
+        for x in range(TEST_WIDTH):
+            for y in range(TEST_HEIGHT):
+                if 0 < x < TEST_WIDTH - 1 and 0 < y < TEST_HEIGHT - 1:
+                    self.assertEqual(self.surface.matrix[x][y], pymlgame.WHITE)
+                else:
+                    self.assertEqual(self.surface.matrix[x][y], pymlgame.BLACK)
+
     def test_get_color(self):
         self.assertEqual(pymlgame.Surface.get_color(pymlgame.GREEN, 1.0),
                          pymlgame.GREEN)