From b95d7ff7fdc07ce3a0cc22d0fde115a57c651478 Mon Sep 17 00:00:00 2001
From: Gary Martin <gary@garycmartin.com>
Date: Mon, 11 Oct 2010 17:49:59 +0000
Subject: Code tidy of PolygonTool class.

---
(limited to 'tools.py')

diff --git a/tools.py b/tools.py
index 11ae09c..65c3e34 100644
--- a/tools.py
+++ b/tools.py
@@ -256,40 +256,41 @@ class PolygonTool(Tool):
         self.safe = False
 
     def handleToolEvent(self, event):
-        if event.type == MOUSEBUTTONDOWN and event.button == 1 and self.vertices is None:
-            self.vertices = [event.pos]
-            self.safe = False
-        if event.type == MOUSEBUTTONUP and event.button == 1 and self.vertices is not None and len(self.vertices) == 1 and event.pos[0] == self.vertices[0][0] and event.pos[1] == self.vertices[0][1]:
-            if self.previous_vertices is not None:
-                last_x_y = self.previous_vertices[-1]
-                delta_x = last_x_y[0] - event.pos[0]
-                delta_y = last_x_y[1] - event.pos[1]
-                self.vertices = [[i[0] - delta_x, i[1] - delta_y]
-                                            for i in self.previous_vertices]
-                self.safe = True
-                self.game.world.add.complexPoly(self.vertices, dynamic=True,
-                                                density=1.0,
-                                                restitution=0.16,
-                                                friction=0.5)
-            self.vertices = None
-        elif (event.type == MOUSEBUTTONUP or event.type == MOUSEBUTTONDOWN) and event.button == 1:
-            if self.vertices is None or (event.pos[0] == self.vertices[-1][0] and event.pos[1] == self.vertices[-1][1]):
-                # Skip if coordinate is same as last one
-                return
-            if distance(event.pos, self.vertices[0]) < 15 and self.safe:
-                self.vertices.append(self.vertices[0]) # Connect the polygon
-                self.game.world.add.complexPoly(self.vertices, dynamic=True,
-                                                density=1.0,
-                                                restitution=0.16,
-                                                friction=0.5)
-                self.previous_vertices = self.vertices[:]
-                self.vertices = None
-            elif distance(event.pos, self.vertices[0]) < 15:
-                self.vertices = None
-            else:
-                self.vertices.append(event.pos)
-                if distance(event.pos, self.vertices[0]) >= 55 and self.vertices:
+        if hasattr(event, 'button') and event.button == 1:
+            if event.type == MOUSEBUTTONDOWN and self.vertices is None:
+                self.vertices = [event.pos]
+                self.safe = False
+            if event.type == MOUSEBUTTONUP and self.vertices is not None and len(self.vertices) == 1 and event.pos[0] == self.vertices[0][0] and event.pos[1] == self.vertices[0][1]:
+                if self.previous_vertices is not None:
+                    last_x_y = self.previous_vertices[-1]
+                    delta_x = last_x_y[0] - event.pos[0]
+                    delta_y = last_x_y[1] - event.pos[1]
+                    self.vertices = [[i[0] - delta_x, i[1] - delta_y]
+                                                for i in self.previous_vertices]
                     self.safe = True
+                    self.game.world.add.complexPoly(self.vertices, dynamic=True,
+                                                    density=1.0,
+                                                    restitution=0.16,
+                                                    friction=0.5)
+                self.vertices = None
+            elif (event.type == MOUSEBUTTONUP or event.type == MOUSEBUTTONDOWN):
+                if self.vertices is None or (event.pos[0] == self.vertices[-1][0] and event.pos[1] == self.vertices[-1][1]):
+                    # Skip if coordinate is same as last one
+                    return
+                if distance(event.pos, self.vertices[0]) < 15 and self.safe:
+                    self.vertices.append(self.vertices[0]) # Connect polygon
+                    self.game.world.add.complexPoly(self.vertices, dynamic=True,
+                                                    density=1.0,
+                                                    restitution=0.16,
+                                                    friction=0.5)
+                    self.previous_vertices = self.vertices[:]
+                    self.vertices = None
+                elif distance(event.pos, self.vertices[0]) < 15:
+                    self.vertices = None
+                else:
+                    self.vertices.append(event.pos)
+                    if distance(event.pos, self.vertices[0]) >= 55:
+                        self.safe = True
 
     def draw(self):
         # Draw the poly being created
--
cgit v0.9.1