Changeset 96:a9b564c38bef

Timestamp:

09/02/13 09:20:34 (8 years ago)

Author:

Neil Muller <drnlmuller@…>

Branch:

default

Phase:

public

Rebase:

62376637636264336162373731303039393262343466323831646431333930653765643431393235

Message:

Support showing exterior filled view in the editor

File:

• tools/area_editor.py (modified) (5 diffs)

tools/area_editor.py

@@ -77 +77 @@
             self.polygons[index].pop()
 
-    def draw(self, surface, topleft, mouse_pos, mouse_poly):
+    def draw(self, surface, topleft, mouse_pos, mouse_poly, filled):
         self._draw_background(True)
         # Draw polygons as needed for the editor
+        if filled:
+            self._draw_exterior(True)
         for index, polygon in self.polygons.items():
             color = POLY_COLORS[index]
@@ -102 +104 @@
         self.cur_poly = None
         self.mouse_pos = None
+        self.filled_mode = False
 
     def move_view(self, offset):
@@ -123 +126 @@
             mouse_pos = None
         self.level.draw(self.surface, self.pos, mouse_pos,
-                self.cur_poly)
+                self.cur_poly, self.filled_mode)
 
     def _level_coordinates(self, pos):
@@ -152 +155 @@
                     if ev.key == pgl.K_1:
                         self.cur_poly = 1
+                        self.filled_mode = False
                     if ev.key == pgl.K_2:
                         self.cur_poly = 2
+                        self.filled_mode = False
                     if ev.key == pgl.K_3:
                         self.cur_poly = 3
+                        self.filled_mode = False
                     if ev.key == pgl.K_4:
                         self.cur_poly = 4
+                        self.filled_mode = False
                     if ev.key == pgl.K_5:
                         self.cur_poly = 5
+                        self.filled_mode = False
                     if ev.key == pgl.K_6:
                         self.cur_poly = 6
+                        self.filled_mode = False
                     if ev.key == pgl.K_0:
                         self.cur_poly = None
@@ -168 +177 @@
                     if ev.key == pgl.K_s:
                         level.save()
+                    if ev.key == pgl.K_f:
+                        if level.all_closed():
+                            self.cur_poly = None
+                            self.filled_mode = True
+                        else:
+                            print 'Not all polygons closed, so not filling'
                 elif ev.type == pgl.MOUSEBUTTONDOWN and self.cur_poly:
                     # Add a point