diff options
| -rw-r--r-- | physics.py | 18 | ||||
| -rw-r--r-- | tools.py | 5 |
2 files changed, 4 insertions, 19 deletions
@@ -12,7 +12,6 @@ from pygame.color import * import olpcgames import elements from elements import Elements -from elements.menu import * from tools import * from helpers import * @@ -36,18 +35,6 @@ class PhysicsGame: } self.currentTool = self.tools["Triangle"] - # setup the menus - self.menu = MenuClass() - self.menu.set_width(self.screen.get_width()) - self.menu.addItem('Box', callback=self.setTool) - self.menu.addItem('Circle', callback=self.setTool) - self.menu.addItem('Triangle', callback=self.setTool) - self.menu.addItem('Polygon', callback=self.setTool) - self.menu.addItem('Magic Pen', callback=self.setTool) - self.menu.addItem('Grab', callback=self.setTool) - self.menu.addItem('Joint', callback=self.setTool) - self.menu.addItem('Destroy', callback=self.setTool) - # set up the world self.world = elements.Elements(self.screen.get_size()) self.world.renderer.set_surface(self.screen) @@ -70,9 +57,6 @@ class PhysicsGame: # draw output from tools self.currentTool.draw() - # draw the menu - self.menu.draw(self.screen) - #Print all the text on the screen text = self.font.render("Current Tool: "+self.currentTool.name, True, (255,255,255)) textpos = text.get_rect(left=700,top=7) @@ -84,7 +68,7 @@ class PhysicsGame: # Try to stay at 30 FPS self.clock.tick(30) # originally 50 - def setTool(self,tool,Discard=None): + def setTool(tool): self.currentTool.cancel() self.currentTool = self.tools[tool] @@ -13,8 +13,6 @@ class Tool(object): self.name = "Tool" def handleEvents(self,event): # default event handling - if event.type == MOUSEBUTTONDOWN: - if self.game.menu.click(event.pos): return True if event.type == QUIT or (event.type == KEYDOWN and event.key == K_ESCAPE): # bye bye! Hope you had fun! self.game.running = False @@ -22,6 +20,9 @@ class Tool(object): if event.key == K_SPACE: #space pauses self.game.world.run_physics = not self.game.world.run_physics + elif event.type == USEREVENT: + # for switching tools + self.game.setTool(event.action) else: # let the subclasses know that no events were handled yet return False |