Clean up the library for CP 4.0

deshipu · deshipu · commit a7b3295ff573 · 2019-04-12T11:17:08.000+02:00
diff --git a/stage.py b/stage.py
@@ -1,7 +1,6 @@
 import time
 import array
 import _stage
-import struct
 
 
 FONT = (b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
@@ -131,7 +130,7 @@
 
 def color565(r, g, b):
     """Convert 24-bit RGB color to 16-bit."""
-    return (b & 0xf8) << 8 | (g & 0xfc) << 3 | r >> 3
+    return (r & 0xf8) << 8 | (g & 0xfc) << 3 | b >> 3
 
 
 def collide(ax0, ay0, ax1, ay1, bx0, by0, bx1=None, by1=None):
@@ -399,11 +398,11 @@ class Stage:
     """
     buffer = bytearray(512)
 
-    def __init__(self, display_bus, fps=6):
+    def __init__(self, display, fps=6):
         self.layers = []
-        self.display_bus = display_bus
-        self.width = 128
-        self.height = 128
+        self.display = display
+        self.width = display.width
+        self.height = display.height
         self.last_tick = time.monotonic()
         self.tick_delay = 1 / fps
 
@@ -416,26 +415,15 @@ def tick(self):
         else:
             self.last_tick = time.monotonic()
 
-    def _block(self, x0, y0, x1, y1):
-        x0 += 3
-        x1 += 3
-        y0 += 2
-        y1 += 2
-        xpos = struct.pack('>HH', x0, x1)
-        self.display_bus.send(0x2a, xpos)
-        ypos = struct.pack('>HH', y0, y1)
-        self.display_bus.send(0x2b, ypos)
-        self.display_bus.send(0x2c, b'')
-
     def render_block(self, x0=0, y0=0, x1=None, y1=None):
         """Update a rectangle of the screen."""
         if x1 is None:
             x1 = self.width
         if y1 is None:
             y1 = self.height
         layers = [l.layer for l in self.layers]
-        self._block(x0, y0, x1 - 1, y1 - 1)
-        _stage.render(x0, y0, x1, y1, layers, self.buffer, self.display_bus)
+        self.display.block(x0, y0, x1 - 1, y1 - 1)
+        _stage.render(x0, y0, x1, y1, layers, self.buffer, self.display.bus)
 
     def render_sprites(self, sprites):
         """Update the spots taken by all the sprites in the list."""
@@ -447,7 +435,7 @@ def render_sprites(self, sprites):
             y1 = max(1, min(self.height, max(sprite.py, int(sprite.y)) + 16))
             if x0 == x1 or y0 == y1:
                 continue
-            self._block(x0, y0, x1 - 1, y1 - 1)
+            self.display.block(x0, y0, x1 - 1, y1 - 1)
             _stage.render(x0, y0, x1, y1, layers, self.buffer,
-                          self.display_bus)
+                          self.display.bus)
             sprite._updated()
diff --git a/ugame10/stage.py b/ugame10/stage.py
@@ -0,0 +1 @@
+../stage.py
diff --git a/ugame10/ugame.py b/ugame10/ugame.py
@@ -8,17 +8,10 @@
 import busio
 import audioio
 import analogio
-
+import struct
 import gamepad
 
 
-try:
-    import displayio
-    HAS_DISPLAYIO = True
-except ImportErrror:
-    HAS_DISPLAYIO = False
-
-
 K_X = 0x01
 K_DOWN = 0x02
 K_LEFT = 0x04
@@ -47,7 +40,27 @@ def mute(self, value=True):
         self.mute_pin.value = not value
 
 
-display_bus = board.DISPLAY.bus
+class Display:
+    buffer = bytearray(4)
+
+    def __init__(self):
+        self.bus = board.DISPLAY.bus
+        self.width = board.DISPLAY.width
+        self.height = board.DISPLAY.height
+
+    def block(self, x0, y0, x1, y1):
+        x0 += 3
+        x1 += 3
+        y0 += 2
+        y1 += 2
+        struct.pack_into('>HH', self.buffer, 0, x0, x1)
+        self.bus.send(0x2a, self.buffer)
+        struct.pack_into('>HH', self.buffer, 0, y0, y1)
+        self.bus.send(0x2b, self.buffer)
+        self.bus.send(0x2c, b'')
+
+
+display = Display()
 buttons = gamepad.GamePad(
     digitalio.DigitalInOut(board.X),
     digitalio.DigitalInOut(board.DOWN),
