Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/tools.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools.py')
-rw-r--r--tools.py23
1 files changed, 14 insertions, 9 deletions
diff --git a/tools.py b/tools.py
index b44ce28..0b3aad2 100644
--- a/tools.py
+++ b/tools.py
@@ -20,7 +20,7 @@ License: GPLv3 http://gplv3.fsf.org/
"""
import pygame
-from elements import box2d
+from elementsbridge import box2d
from pygame.locals import *
from helpers import *
from inspect import getmro
@@ -50,9 +50,9 @@ class Tool(object):
name = "Tool"
icon = "icon"
toolTip = "Tool Tip"
- def __init__(self, gameinstance):
- self.game = gameinstance
- self.name = "Tool"
+ #def __init__(self, gameinstance):
+ # self.game = gameinstance
+ # self.name = "Tool"
def handleevents(self, event):
"""Default method of Handling events
@@ -120,6 +120,7 @@ class CircleTool(Tool):
def __init__(self, gameinstance):
Tool.__init__(gameinstance)
+ self.game = gameinstance
self.name = "Circle"
self.pt1 = None
self.radius = None
@@ -128,7 +129,7 @@ class CircleTool(Tool):
"""
# look for default events, and if none are handled then
# try the custom events
- if not super(CircleTool, self).handleEvents(event):
+ if not super(CircleTool, self).handleevents(event):
if event.type == MOUSEBUTTONDOWN:
if event.button == 1:
self.pt1 = pygame.mouse.get_pos()
@@ -167,6 +168,7 @@ class GirderTool(Tool):
def __init__(self, gameinstance):
Tool.__init__(gameinstance)
+ self.game = gameinstance
self.name = "Girder" # TODO was "box", why?
self.pt1 = None
self.pt2 = None
@@ -184,7 +186,7 @@ class GirderTool(Tool):
"""
# look for default events, and if none are handled then
# try the custom events
- if not super(GirderTool, self).handleEvents(event):
+ if not super(GirderTool, self).handleevents(event):
if event.type == MOUSEBUTTONDOWN:
if event.button == 1:
self.pt1 = pygame.mouse.get_pos()
@@ -241,6 +243,7 @@ class GrabTool(Tool):
def __init__(self, gameinstance):
Tool.__init__(gameinstance)
+ self.game = gameinstance
self.name = "Grab"
def handleevents(self, event):
@@ -248,7 +251,7 @@ class GrabTool(Tool):
"""
# look for default events, and if none are handled then
# try the custom events
- if not super(GrabTool, self).handleEvents(event):
+ if not super(GrabTool, self).handleevents(event):
if event.type == MOUSEBUTTONDOWN:
if event.button == 1:
# grab the first object at the mouse pointer
@@ -281,6 +284,7 @@ class DestroyTool(Tool):
def __init__(self, gameinstance):
Tool.__init__(gameinstance)
+ self.game = gameinstance
self.name = "Destroy"
self.vertices = None
def handleevents(self, event):
@@ -289,7 +293,7 @@ class DestroyTool(Tool):
"""
# look for default events, and if none are handled then try
# the custom events
- if not super(DestroyTool, self).handleEvents(event):
+ if not super(DestroyTool, self).handleevents(event):
if pygame.mouse.get_pressed()[0]:
if not self.vertices:
self.vertices = []
@@ -332,6 +336,7 @@ class BridgeJointTool(Tool):
def __init__(self, gameinstance):
Tool.__init__(gameinstance)
+ self.game = gameinstance
self.name = "Bridge Joint"
self.jb1 = self.jb2 = self.jb1pos = self.jb2pos = None
@@ -341,7 +346,7 @@ class BridgeJointTool(Tool):
"""
# look for default events, and if none are handled then try
# the custom events
- if super(BridgeJointTool, self).handleEvents(event):
+ if super(BridgeJointTool, self).handleevents(event):
return
if event.type != MOUSEBUTTONUP or event.button != 1:
return