projects
/
minwii.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
On commence à mettre les données dans l'exe.
[minwii.git]
/
src
/
pywiiuse
/
pygame_wiimouse.py
diff --git
a/src/pywiiuse/pygame_wiimouse.py
b/src/pywiiuse/pygame_wiimouse.py
index
5e764ce
..
55a9c99
100755
(executable)
--- a/
src/pywiiuse/pygame_wiimouse.py
+++ b/
src/pywiiuse/pygame_wiimouse.py
@@
-22,6
+22,7
@@
class wiimote_thread(Thread):
self.queue = Queue()
self.startup = Queue()
self.nmotes = nmotes
self.queue = Queue()
self.startup = Queue()
self.nmotes = nmotes
+ self.selectedWiimoteIndex = 0
self.timeout = timeout
self.setDaemon(1)
self._paused = False
self.timeout = timeout
self.setDaemon(1)
self._paused = False
@@
-48,10
+49,9
@@
class wiimote_thread(Thread):
if self._paused : continue
try :
if wiiuse.poll(self.wiimotes, self.nmotes) :
if self._paused : continue
try :
if wiiuse.poll(self.wiimotes, self.nmotes) :
- for i in range(self.nmotes):
- m = self.wiimotes[i]
- if m[0].event == wiiuse.EVENT:
- self.event_cb(m)
+ m = self.wiimotes[self.selectedWiimoteIndex]
+ if m[0].event == wiiuse.EVENT:
+ self.event_cb(m)
except :
pass
except :
pass
@@
-60,7
+60,6
@@
class wiimote_thread(Thread):
func, args = self.queue.get_nowait()
except Empty:
break
func, args = self.queue.get_nowait()
except Empty:
break
- print 'do:', func.__name__, args
func(*args)
def pause(self) :
func(*args)
def pause(self) :
@@
-68,6
+67,9
@@
class wiimote_thread(Thread):
def resume(self) :
self._paused = False
def resume(self) :
self._paused = False
+
+ def selectWiimote(self, wiimoteIndex) :
+ self.selectedWiimoteIndex = wiimoteIndex
def do(self, func, *args):
'''Run the function in the thread handling the wiimote'''
def do(self, func, *args):
'''Run the function in the thread handling the wiimote'''
@@
-119,18
+121,29
@@
class wiimote_thread(Thread):
wiiuse.disconnect(self.wiimotes[i])
self.go = False
wiiuse.disconnect(self.wiimotes[i])
self.go = False
+ def get_count(self):
+ return self.actual_nmotes
+
+
WT = None
WT = None
-def init(nmotes, timeout):
+def init(nmotes, timeout
, screenResolution=(660, 370)
):
'''Initialize the module.'''
global WT
if WT:
return
WT = wiimote_thread(nmotes, timeout)
'''Initialize the module.'''
global WT
if WT:
return
WT = wiimote_thread(nmotes, timeout)
+
+ 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=wiiuse.IR_ABOVE)
+
def get_count():
'''How many Wiimotes were found?'''
def get_count():
'''How many Wiimotes were found?'''
- return WT.
actual_nmotes
+ return WT.
get_count()
def quit():
'''Gracefully shutdown the connection and turn off the wiimote leds'''
def quit():
'''Gracefully shutdown the connection and turn off the wiimote leds'''
@@
-182,7
+195,6
@@
class wiimote(object):
enable |= wiiuse.ORIENT_THRESH
else:
disable |= wiiuse.ORIENT_THRESH
enable |= wiiuse.ORIENT_THRESH
else:
disable |= wiiuse.ORIENT_THRESH
- print enable, disable
WT.do(wiiuse.set_flags, self.wm, enable, disable)
def set_orient_thresh(self, thresh):
WT.do(wiiuse.set_flags, self.wm, enable, disable)
def set_orient_thresh(self, thresh):