# HG changeset patch # User Simon Cross # Date 1378562368 -7200 # Node ID 11eaf0d3e61287af72dedfa171c772288d729ffd # Parent c2909e9411aebbdfae8dfbb68305fb7affff5625 Fix boogs. diff -r c2909e9411ae -r 11eaf0d3e612 tools/area_editor.py --- a/tools/area_editor.py Sat Sep 07 15:55:27 2013 +0200 +++ b/tools/area_editor.py Sat Sep 07 15:59:28 2013 +0200 @@ -143,11 +143,13 @@ line_width) break if move_poly_mode and index == self._move_poly and move_point: - pointlist = [p for p in self.translate_poly( - polygon, move_point, mouse_pos)] + new_point = self.point_to_pymunk(mouse_pos) + pointlist = [self.point_to_pygame(p) + for p in self.translate_poly( + polygon, move_point, new_point)] pygame.draw.lines(self._surface, color, False, pointlist, line_width) - break + #break if len(polygon) > 1: pointlist = [self.point_to_pygame(p) for p in polygon] pygame.draw.lines(self._surface, color, False, pointlist, @@ -227,7 +229,7 @@ def find_vertex(self, mouse_pos): # search for vertexes closest to where we've killed - mindist = 400 + mindist = 1000 move_point = None search_point = self.point_to_pymunk(mouse_pos) for index, polygon in self.polygons.items(): @@ -247,19 +249,17 @@ self._move_poly = None return move_point - def translate_poly(self, poly, move_point, mouse_point): - print "Translate!" - dx = mouse_point[0] - move_point[0] - dy = mouse_point[1] - move_point[1] + def translate_poly(self, poly, move_point, new_point): + dx = new_point[0] - move_point[0] + dy = new_point[1] - move_point[1] new_poly = [(p[0] + dx, p[1] + dy) for p in poly] return new_poly - def replace_poly(self, old_point, new_point): - print "Replace!", self._move_poly + def replace_poly(self, move_point, new_point): new_point = self.point_to_pymunk(new_point) if self._move_poly: self.polygons[self._move_poly] = self.translate_poly( - self.polygons[self._move_poly], old_point, new_point) + self.polygons[self._move_poly], move_point, new_point) def replace_vertex(self, old_point, new_point): new_point = self.point_to_pymunk(new_point) @@ -620,7 +620,6 @@ def mouse_down(self, ev): corrected_pos = self._level_coordinates(ev.pos) snapped_pos = self.snap_to_grid(corrected_pos) - print self._move_poly_mode, ev.button, self._move_point if self.sel_mode and ev.button == 1: obj = self.level.find_obj_at_pos(corrected_pos) if obj is not None: @@ -634,7 +633,6 @@ else: # find the current point self._move_point = self.level.find_vertex(snapped_pos) - print "NEW MOV:", self._move_point elif self._move_point_mode and ev.button == 1: if self._move_point: # Place the current point