Merge branch 'feature/controller' into develop

Author: XenGi

controller_example.py

@@ -0,0 +1,99 @@
+#!/usr/bin/env python2.7
+# -*- coding: utf-8 -*-
+
+"""
+pymlgame - controller example
+=============================
+
+This example shows how you can use a controller connected to a laptop or any
+other machine capable of pygame to connect to a pymlgame instance.
+"""
+
+__author__ = "Ricardo Band"
+__copyright__ = "Copyright 2013, Ricardo Band"
+__credits__ = ["Ricardo Band"]
+__license__ = "MIT"
+__version__ = "0.1.0"
+__maintainer__ = "Ricardo Band"
+__email__ = "[email protected]"
+__status__ = "Development"
+
+import sys
+
+import pygame
+import jsonrpclib
+
+
+class Controller(object):
+    def __init__(self, host, port):
+        self.host = host
+        self.port = port
+        pygame.init()
+        self.joysticks = [[pygame.joystick.Joystick(j), None, None]
+                          for j in range(pygame.joystick.get_count())]
+        self.screen = pygame.display.set_mode((100, 10))
+        pygame.display.set_caption("pymlgame_ctlr")
+        self.clock = pygame.time.Clock()
+        self.server = jsonrpclib.Server('http://' + self.host + ':' +
+                                        str(self.port))
+        for joy in self.joysticks:
+            joy[0].init()
+            joy[1] = self.server.init()
+            if joy[0].get_name() == 'Xbox 360 Wireless Receiver':
+                joy[2] = {0: 'A',
+                          1: 'B',
+                          2: 'X',
+                          3: 'Y',
+                          4: 'L1',
+                          5: 'R1',
+                          6: 'Select',
+                          7: 'Start',
+                          11: 'Left',
+                          12: 'Right',
+                          13: 'Up',
+                          14: 'Down'}
+
+    def handle_events(self):
+        for event in pygame.event.get():
+            if event.type == pygame.QUIT:
+                pygame.joystick.quit()
+                pygame.quit()
+                sys.exit()
+            if event.type == pygame.KEYDOWN:
+                if event.key == pygame.K_ESCAPE:
+                    pygame.event.post(pygame.event.Event(pygame.QUIT))
+            if event.type == pygame.JOYBUTTONDOWN:
+                print('joy', self.joysticks[event.joy][0].get_name(),
+                      '(uid:', self.joysticks[event.joy][1], ')button pressed:',
+                      event.button)
+                self.server.trigger_button(self.joysticks[event.joy][1],
+                                           'KeyDown',
+                                           self.joysticks[event.joy][2][event.button])
+            if event.type == pygame.JOYBUTTONUP:
+                print('joy', self.joysticks[event.joy][0].get_name(),
+                      '(uid:', self.joysticks[event.joy][1], ')button released:',
+                      event.button)
+                self.server.trigger_button(self.joysticks[event.joy][1],
+                                           'KeyUp',
+                                           self.joysticks[event.joy][2][event.button])
+
+    def update(self):
+        pass
+
+    def render(self):
+        pygame.display.update()
+        pygame.display.flip()
+
+    def gameloop(self):
+        try:
+            while True:
+                self.handle_events()
+                self.update()
+                self.render()
+        except KeyboardInterrupt:
+            pass
+
+
+if __name__ == '__main__':
+    CTLR = Controller('127.0.0.1', 1338)
+    CTLR.gameloop()

emu.py

@@ -3,13 +3,17 @@
 
 """
 pymlgame - Mate Light emulator
+==============================
+
+This little program emulates the awesome Mate Light, just in case you're not
+at c-base but want to code something for it.
 """
 
 __author__ = "Ricardo Band"
 __copyright__ = "Copyright 2013, Ricardo Band"
 __credits__ = ["Ricardo Band"]
 __license__ = "MIT"
-__version__ = "0.0.1"
+__version__ = "0.1.0"
 __maintainer__ = "Ricardo Band"
 __email__ = "[email protected]"
 __status__ = "Development"
@@ -21,7 +25,14 @@
 
 
 class Emu(object):
+    """
+    The Emulator is a simple pygame game.
+    """
     def __init__(self, width=40, height=40, ip='127.0.0.1', port=1337):
+        """
+        Creates a screen with the given size, generates the matrix for the
+        Mate bottles and binds the socket for incoming frames.
+        """
         self.width = width
         self.height = height
         pygame.init()
@@ -37,26 +48,39 @@ def __init__(self, width=40, height=40, ip='127.0.0.1', port=1337):
         self.sock.bind((ip, port))
 
     def recv_data(self):
+        """
+        Grab the next frame and put it on the matrix.
+        """
         data, addr = self.sock.recvfrom(self.width * self.height * 3 + 4)
         self.matrix = map(ord, data.strip())[:-4]
 
     def update(self):
+        """
+        Generate the output from the matrix.
+        """
         pixels = len(self.matrix)
         for x in range(self.width):
             for y in range(self.height):
                 pixel = y * self.width * 3 + x * 3
-                # sometimes the matrix is not as big as it should
+                #TODO: sometimes the matrix is not as big as it should
                 if pixel < pixels:
                     pygame.draw.circle(self.screen, (self.matrix[pixel],
                                                      self.matrix[pixel + 1],
                                                      self.matrix[pixel + 2]),
                                        (x * 10 + 5, y * 10 + 5), 5, 0)
 
     def render(self):
+        """
+        Output the current screen.
+        """
         pygame.display.update()
         pygame.display.flip()
 
     def gameloop(self):
+        """
+        Loop through all the necessary stuff and end execution when Ctrl+C
+        was hit.
+        """
         try:
             while True:
                 for event in pygame.event.get():

example.py renamed to game_example.py

@@ -2,14 +2,19 @@
 # -*- coding: utf-8 -*-
 
 """
-pymlgame example game
+pymlgame - example game
+=======================
+
+This example shows how a simple pymlgame could be written. You also need a
+connected controller to actually see something happening. You can use the
+controller example for this.
 """
 
 __author__ = "Ricardo Band"
 __copyright__ = "Copyright 2013, Ricardo Band"
 __credits__ = ["Ricardo Band"]
 __license__ = "MIT"
-__version__ = "0.0.1"
+__version__ = "0.1.0"
 __maintainer__ = "Ricardo Band"
 __email__ = "[email protected]"
 __status__ = "Development"
@@ -19,13 +24,18 @@
 
 class Game(object):
     """
-    The main game class that holds the gameloop
+    The main game class that holds the gameloop.
     """
     def __init__(self, host, port, width, height):
         """
-        Create a screen and define some game specific things
+        Create a screen and define some game specific things.
         """
-        self.screen = pymlgame.Screen(host, port, width, height)
+        self.host = host
+        self.port = port
+        self.width = width
+        self.height = height
+        self.screen = pymlgame.Screen(self.host, self.port,
+                                      self.width, self.height)
         self.clock = pymlgame.Clock()
         self.running = True
         self.colors = [pymlgame.WHITE,
@@ -47,9 +57,11 @@ def __init__(self, host, port, width, height):
         self.filled = pymlgame.Surface(int(self.screen.width / 2) - 2,
                                        int(self.screen.height / 2) - 2)
 
+        self.ctlr = pymlgame.Controller(self.host, self.port + 1)
+
     def update(self):
         """
-        Update the screens contents in every loop
+        Update the screens contents in every loop.
         """
         # this is not really neccesary because the surface is black after
         # initializing
@@ -86,7 +98,7 @@ def update(self):
 
     def render(self):
         """
-        Send the current screen content to Mate Light
+        Send the current screen content to Mate Light.
         """
         self.screen.reset()
         self.screen.blit(self.corners)
@@ -101,13 +113,23 @@ def render(self):
 
     def handle_events(self):
         """
-        Loop through all events
+        Loop through all events.
         """
-        self.colors.append(self.colors.pop(0))
+        for event in self.ctlr.get_events():
+            if event.type == pymlgame.NEWCTLR:
+                print('new ctlr with uid:', event.uid)
+            elif event.type == pymlgame.KEYDOWN:
+                print('key', event.button, 'down on', event.uid)
+                self.colors.append(self.colors.pop(0))
+            elif event.type == pymlgame.KEYUP:
+                print('key', event.button, 'up on', event.uid)
+                self.colors.append(self.colors.pop(0))
+            elif event.type == pymlgame.PING:
+                print('ping from', event.uid)
 
     def gameloop(self):
         """
-        A game loop that circles through the methods
+        A game loop that circles through the methods.
         """
         try:
             while True:

pymlgame/__init__.py

@@ -10,9 +10,7 @@
 __status__ = "Development"
 
 from pymlgame.locals import *
-from pymlgame.events import EventListener
 from pymlgame.screen import Screen
 from pymlgame.clock import Clock
 from pymlgame.surface import Surface
-
-events = EventListener()
+from pymlgame.controller import Controller