From 313b03a86347294b6744c127a92a9eedad4d3ba0 Mon Sep 17 00:00:00 2001
From: Brian Jordan <brian@laptop.org>
Date: Sun, 20 Jul 2008 20:24:38 +0000
Subject: Joystick button (is awesome... in progress)

---
diff --git a/DEVELOPING b/DEVELOPING
index 18ed7d5..3369c8a 100644
--- a/DEVELOPING
+++ b/DEVELOPING
@@ -1,6 +1,6 @@
 activity/
 activity.py
-elements/ -r (upstream, but branched here) Simplification wrapper around pyBox2D (in a subdirectory here)
+elements/ - (upstream, but branched here) Simplification wrapper around pyBox2D (in a subdirectory here)
 helpers.py - mathematical helper functions
 icons/ - all graphics used in Physics (mostly svg menu icons)
 olpcgames/ - (upstream) The Pygame wrapper for the OLPC Sugar platform
diff --git a/physics.py b/physics.py
index 9d84665..4b2bbdc 100644
--- a/physics.py
+++ b/physics.py
@@ -32,7 +32,8 @@ class PhysicsGame:
         self.clock = pygame.time.Clock()
         self.font = pygame.font.Font(None, 24) # font object
         self.canvas = olpcgames.ACTIVITY.canvas
-         
+        self.joystickobject = None 
+        self.debug = True
         # create the name --> instance map for components
         self.toolList = {}
         for c in tools.allTools:
diff --git a/tools.py b/tools.py
index 01f3d83..0ce23d9 100644
--- a/tools.py
+++ b/tools.py
@@ -43,6 +43,39 @@ class Tool(object):
                 self.game.setTool("magicpen")
             #elif event.key == K_g:
             #    self.game.setTool("gear")
+            # Game/joystick-related keys
+            elif event.key == K_KP4: # Left gamepad, left arrow
+                if self.game.joystickobject:
+                    self.game.joystickobject[0].ApplyTorque(9000) 
+                elif self.game.debug: print "Left gamepad left arrow error: no joystick object selected"
+            elif event.key == K_KP6: # Left gamepad, right arrow
+                if self.game.joystickobject:
+                    self.game.joystickobject[0].ApplyTorque(9000) 
+                elif self.game.debug: print "Left gamepad right arrow error: no joystick object selected"
+            elif event.key == K_KP8: # Left gamepad, up arrow
+                if self.game.joystickobject:
+                    self.game.joystickobject[0].ApplyTorque(9000) 
+                elif self.game.debug: print "Left gamepad up arrow error: no joystick object selected"
+            elif event.key == K_KP2: # Left gamepad, down arrow
+                if self.game.joystickobject:
+                    self.game.joystickobject[0].ApplyTorque(9000) 
+                elif self.game.debug: print "Left gamepad down arrow error: no joystick object selected"
+            elif event.key == K_KP7: # Right gamepad, square
+                if self.game.joystickobject:
+                    self.game.joystickobject[0].ApplyTorque(-9000) 
+                elif self.game.debug: print "Right gamepad square button error: no joystick object selected"
+            elif event.key == K_KP1: # Right gamepad, check
+                if self.game.joystickobject:
+                    self.game.joystickobject[0].ApplyTorque(-9000) 
+                elif self.game.debug: print "Right gamepad check button error: no joystick object selected"
+            elif event.key == K_KP9: # Right gamepad, circle
+                if self.game.joystickobject:
+                    self.game.joystickobject[0].ApplyTorque(-9000) 
+                elif self.game.debug: print "Right gamepad circle button error: no joystick object selected"
+            elif event.key == K_KP3: # Right gamepad, X
+                if self.game.joystickobject:
+                    self.game.joystickobject[0].ApplyTorque(-9000) 
+                elif self.game.debug: print "Right gamepad X button error: no joystick object selected"
         elif event.type == USEREVENT:
             if hasattr(event,"action"):
                 if self.game.toolList.has_key(event.action): self.game.setTool(event.action)
@@ -374,17 +407,19 @@ class JoystickTool(Tool):
         #self.joystickobject
     def handleEvents(self,event):
         #look for default events, and if none are handled then try the custom events 
-        if not super(JoystickTool,self).handleEvents(event):
-            if pygame.mouse.get_pressed()[0]:
-                if not self.vertices: self.vertices = []
+        super(JoystickTool,self).handleEvents(event)
+        if pygame.mouse.get_pressed()[0]:
+            if not self.vertices:
+                self.vertices = []
                 self.vertices.append(pygame.mouse.get_pos())
-                if len(self.vertices) > 10:
-                    self.vertices.pop(0)
-                self.joystickobject = self.game.world.get_bodies_at_pos(pygame.mouse.get_pos())
-                if tokill:
-                        self.game.world.world.DestroyBody(tokill[0])
-            elif event.type == MOUSEBUTTONUP and event.button == 1:
-                self.cancel()
+            if len(self.vertices) > 10:
+                self.vertices.pop(0)
+            self.game.joystickobject = self.game.world.get_bodies_at_pos(pygame.mouse.get_pos())
+            if self.game.joystickobject:
+                print "hi1"                
+        #self.game.world.world.DestroyBody(self.joystickobject[0])
+        elif event.type == MOUSEBUTTONUP and event.button == 1:
+            self.cancel()
     def draw(self):
         # draw the trail
         if self.vertices:
--
cgit v0.9.1