X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/0e6420a8ac9fcefa6a83a2f515b3fe6858a372cd..6e5711305d3bf1b264625072db77d471c686be03:/src/pywiiuse/pygame_wiimouse.py

diff --git a/src/pywiiuse/pygame_wiimouse.py b/src/pywiiuse/pygame_wiimouse.py
index e5d506c..013d91b 100755
--- a/src/pywiiuse/pygame_wiimouse.py
+++ b/src/pywiiuse/pygame_wiimouse.py
@@ -17,13 +17,16 @@ wiiuse = None # import within the thread, why do I have to do this?
 
 class wiimote_thread(Thread):
     '''Manage the wiiuse interface'''
-    def __init__(self, nmotes=1, timeout=5):
+    
+    def __init__(self, nmotes=1, timeout=5, screenResolution=(660, 370), position='ABOVE'):
         Thread.__init__(self, name='wiimote')
         self.queue = Queue()
         self.startup = Queue()
         self.nmotes = nmotes
-        self.selectedWiimoteIndex = 0
         self.timeout = timeout
+        self.screenResolution = screenResolution
+        self.position = position
+        self.selectedWiimoteIndex = 0
         self.setDaemon(1)
         self._paused = False
         self.start()
@@ -41,9 +44,19 @@ class wiimote_thread(Thread):
         found = wiiuse.find(self.wiimotes, self.nmotes, self.timeout)
         self.actual_nmotes = wiiuse.connect(self.wiimotes, self.nmotes)
         
-
-        for i in range(self.nmotes):
-            wiiuse.set_leds(self.wiimotes[i], wiiuse.LED[i])
+        
+        if self.nmotes <= 4 :
+            for i in range(self.nmotes):
+                wiiuse.set_leds(self.wiimotes[i], wiiuse.LED[i])
+        else :
+            for i in range(4):
+                wiiuse.set_leds(self.wiimotes[i], wiiuse.LED[i])
+
+            if self.nmotes == 5 :
+                wiiuse.set_leds(self.wiimotes[4], wiiuse.LED_1 | wiiuse.LED_4)
+            if self.nmotes == 6 :
+                wiiuse.set_leds(self.wiimotes[4], wiiuse.LED_1 | wiiuse.LED_4)
+                wiiuse.set_leds(self.wiimotes[5], wiiuse.LED_1 | wiiuse.LED_2 | wiiuse.LED_3 | wiiuse.LED_4)
 
         self.go = self.actual_nmotes != 0
 
@@ -75,6 +88,23 @@ class wiimote_thread(Thread):
     
     def selectWiimote(self, wiimoteIndex) :
         self.selectedWiimoteIndex = wiimoteIndex
+        for i in range(self.actual_nmotes) :
+            wm = self.wiimotes[i]
+            if i == wiimoteIndex :
+                self.do(wiiuse.set_ir, wm, 1)
+                self.do(wiiuse.set_ir_vres, wm, *self.screenResolution)
+                if self.position == 'ABOVE' :
+                    position = wiiuse.IR_ABOVE
+                elif self.position == 'BELOW' :
+                    position = wiiuse.IR_BELOW
+                else :
+                    position = wiiuse.IR_ABOVE
+                self.do(wiiuse.set_ir_position, wm, position)
+                # TODO aspect ratio
+                #self.do(wiiuse.set_aspect_ratio, wm, aspect)
+                
+            else :
+                self.do(wiiuse.set_ir, wm, 0)
 
     def do(self, func, *args):
         '''Run the function in the thread handling the wiimote'''
@@ -169,7 +199,7 @@ def _full_mouse_event_cb(self, id, wmp):
         if button :
             event = pygame.event.Event(pygame.MOUSEBUTTONUP,
                                        pos = pos,
-                                       button = 1)
+                                       button = button)
             pygame.event.post(event)
 
 
@@ -180,21 +210,14 @@ def init(nmotes, timeout, screenResolution=(660, 370), position='ABOVE'):
     global WT
     if WT:
         return
-    WT = wiimote_thread(nmotes, timeout)
-    
-    if position == 'ABOVE' :
-        position = wiiuse.IR_ABOVE
-    elif position == 'BELOW' :
-        position = wiiuse.IR_BELOW
-    else :
-        position = wiiuse.IR_ABOVE
     
+    WT = wiimote_thread(nmotes, timeout, screenResolution, position)
     
     nmotes = get_count()
     for i in range(nmotes) :
         wm = Wiimote(i) # access the wiimote object
         wm.enable_accels(0) # turn off acceleration reporting
-        wm.enable_ir(1, vres = screenResolution, position=position)
+        #wm.enable_ir(1, vres = screenResolution, position=position)
 
 
 def get_count():