Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/physics.py
diff options
context:
space:
mode:
authorAlex <alex@Tiresias.(none)>2008-07-08 22:02:47 (GMT)
committer Alex <alex@Tiresias.(none)>2008-07-08 22:02:47 (GMT)
commit336cfa27876b0bd93bd34d68bc5d010b9171d812 (patch)
treeee7721176dba2fa3121156ef0fae4b85da3b6e36 /physics.py
parent40c895937c2dbbcd09ec98ae2a1cb532e0d3be38 (diff)
Added menu functionality
Diffstat (limited to 'physics.py')
-rw-r--r--physics.py18
1 files changed, 1 insertions, 17 deletions
diff --git a/physics.py b/physics.py
index 47a91fb..b8f4929 100644
--- a/physics.py
+++ b/physics.py
@@ -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]