Mercurial > nagslang
annotate tools/area_editor.py @ 441:707d06a77f39
Also scale current line
author | Neil Muller <drnlmuller@gmail.com> |
---|---|
date | Sat, 07 Sep 2013 14:36:31 +0200 |
parents | 4c60df80b91b |
children | a99e5e724545 0f8945232e54 |
rev | line source |
---|---|
71
c449a3507a6b
Shebang and path hacking, so that the area_editor runs
Stefano Rivera <stefano@rivera.za.net>
parents:
57
diff
changeset
|
1 #!/usr/bin/env python |
c449a3507a6b
Shebang and path hacking, so that the area_editor runs
Stefano Rivera <stefano@rivera.za.net>
parents:
57
diff
changeset
|
2 |
51 | 3 # The basic area editor |
4 # | |
5 # To edit an existing level, use | |
6 # editor levelname | |
7 # | |
8 # To create a new level: | |
9 # | |
315 | 10 # editor levelname <xsize> <ysize> |
51 | 11 # (size specified in pixels |
12 # | |
13 | |
71
c449a3507a6b
Shebang and path hacking, so that the area_editor runs
Stefano Rivera <stefano@rivera.za.net>
parents:
57
diff
changeset
|
14 import os |
c449a3507a6b
Shebang and path hacking, so that the area_editor runs
Stefano Rivera <stefano@rivera.za.net>
parents:
57
diff
changeset
|
15 import sys |
c449a3507a6b
Shebang and path hacking, so that the area_editor runs
Stefano Rivera <stefano@rivera.za.net>
parents:
57
diff
changeset
|
16 |
51 | 17 import pygame |
18 import pygame.locals as pgl | |
19 | |
152
8bbe57d9de0c
Rejig sys.path hacking above albow import, so I can hide it in the root of my repo
Stefano Rivera <stefano@rivera.za.net>
parents:
151
diff
changeset
|
20 sys.path.append(os.path.join(os.path.dirname(__file__), '..')) |
8bbe57d9de0c
Rejig sys.path hacking above albow import, so I can hide it in the root of my repo
Stefano Rivera <stefano@rivera.za.net>
parents:
151
diff
changeset
|
21 |
153
6c5f1a78db75
Levels need a pymunk Space to load
Stefano Rivera <stefano@rivera.za.net>
parents:
152
diff
changeset
|
22 import pymunk |
6c5f1a78db75
Levels need a pymunk Space to load
Stefano Rivera <stefano@rivera.za.net>
parents:
152
diff
changeset
|
23 |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
24 from albow.root import RootWidget |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
25 from albow.widget import Widget |
198 | 26 from albow.controls import Button, Label, CheckBox |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
27 from albow.dialogs import alert, Dialog |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
28 from albow.layout import Row |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
29 from albow.fields import TextField |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
30 from albow.table_view import TableView, TableColumn |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
31 |
199
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
32 from nagslang.options import parse_args |
109
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
33 from nagslang.constants import SCREEN |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
34 from nagslang.level import Level, POLY_COLORS, LINE_COLOR |
255 | 35 from nagslang.yamlish import load_s |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
36 import nagslang.enemies as ne |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
37 import nagslang.game_object as ngo |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
38 import nagslang.puzzle as np |
51 | 39 |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
40 # layout constants |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
41 MENU_BUTTON_HEIGHT = 35 |
423 | 42 MENU_PAD = 4 |
115 | 43 MENU_HALF_PAD = MENU_PAD // 2 |
44 MENU_LEFT = SCREEN[0] + MENU_HALF_PAD | |
45 MENU_WIDTH = 200 - MENU_PAD | |
419 | 46 MENU_HALF_WIDTH = MENU_WIDTH // 2 - MENU_HALF_PAD |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
47 |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
48 BUTTON_RECT = pygame.rect.Rect(0, 0, MENU_WIDTH, MENU_BUTTON_HEIGHT) |
419 | 49 HALF_BUTTON_RECT = pygame.rect.Rect(0, 0, MENU_HALF_WIDTH, MENU_BUTTON_HEIGHT) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
50 CHECK_RECT = pygame.rect.Rect(0, 0, MENU_BUTTON_HEIGHT // 2, |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
51 MENU_BUTTON_HEIGHT // 2) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
52 |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
53 |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
54 class TestWorld(object): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
55 |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
56 def __init__(self): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
57 self.level_state = {} |
407 | 58 self.inventory = {} |
59 | |
60 | |
61 def distance(tup1, tup2): | |
62 return (tup1[0] - tup2[0]) ** 2 + (tup1[1] - tup2[1]) ** 2 | |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
63 |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
64 |
51 | 65 class EditorLevel(Level): |
66 | |
67 def __init__(self, name, x=800, y=600): | |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
68 world = TestWorld() |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
69 super(EditorLevel, self).__init__(name, world) |
51 | 70 self.x = x |
71 self.y = y | |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
72 # Lookup initiliasition info from the objects |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
73 self.lookup = {} |
407 | 74 self._move_poly = None |
51 | 75 |
439
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
76 def _in_bounds(self, pos): |
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
77 if pos[0] < 0 or pos[0] >= self.x: |
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
78 return False |
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
79 if pos[1] < 0 or pos[1] >= self.y: |
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
80 return False |
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
81 return True |
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
82 |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
83 def load(self, space): |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
84 super(EditorLevel, self).load(space) |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
85 # Needed to fill in the lookup dict |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
86 self.reset_objs() |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
87 |
51 | 88 def point_to_pymunk(self, pos): |
89 # inverse of point_to_pygame | |
90 # (this is also the same as point_to_pygame, but a additional | |
91 # function for sanity later in pyweek). | |
92 return (pos[0], self.y - pos[1]) | |
93 | |
94 def add_point(self, poly_index, pos): | |
95 self.polygons.setdefault(poly_index, []) | |
439
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
96 if not self._in_bounds(pos): |
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
97 return False |
51 | 98 if not self.polygons[poly_index]: |
424 | 99 point = self.point_to_pymunk(pos) |
99 | 100 self.polygons[poly_index].append(point) |
51 | 101 else: |
424 | 102 add_pos = self.point_to_pymunk(pos) |
51 | 103 self.polygons[poly_index].append(add_pos) |
439
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
104 return True |
51 | 105 |
106 def delete_point(self, index): | |
107 if index in self.polygons and len(self.polygons[index]) > 0: | |
108 self.polygons[index].pop() | |
109 | |
135
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
110 def close_poly(self, index): |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
111 """Attempts to close the current polygon. |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
112 |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
113 We allow a small additional step to close the polygon, but |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
114 it's limited as it's a magic point addition""" |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
115 if len(self.polygons[index]) < 2: |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
116 # Too small |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
117 return False |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
118 first = self.polygons[index][0] |
439
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
119 if self.add_point(index, self.point_to_pygame(first)): |
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
120 return True |
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
121 return False |
135
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
122 |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
123 def add_line(self, start_pos, end_pos): |
424 | 124 startpoint = self.point_to_pymunk(start_pos) |
125 endpoint = self.point_to_pymunk(end_pos) | |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
126 self.lines.append([startpoint, endpoint]) |
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
127 |
407 | 128 def draw(self, mouse_pos, mouse_poly, filled, draw_cand_line, start_pos, |
436
7079c3214d72
Scale lines when we zoom out
Neil Muller <drnlmuller@gmail.com>
parents:
435
diff
changeset
|
129 move_point_mode, move_point, zoom_factor): |
51 | 130 self._draw_background(True) |
131 # Draw polygons as needed for the editor | |
436
7079c3214d72
Scale lines when we zoom out
Neil Muller <drnlmuller@gmail.com>
parents:
435
diff
changeset
|
132 line_width = int(2 * zoom_factor) |
96
a9b564c38bef
Support showing exterior filled view in the editor
Neil Muller <drnlmuller@gmail.com>
parents:
72
diff
changeset
|
133 if filled: |
a9b564c38bef
Support showing exterior filled view in the editor
Neil Muller <drnlmuller@gmail.com>
parents:
72
diff
changeset
|
134 self._draw_exterior(True) |
51 | 135 for index, polygon in self.polygons.items(): |
425 | 136 color = POLY_COLORS.get(index, pygame.color.THECOLORS['black']) |
407 | 137 if move_point_mode and index == self._move_poly: |
138 pointlist = [p for p in polygon] | |
139 pointlist = [self.point_to_pygame(p) if p != move_point else | |
140 mouse_pos for p in pointlist] | |
436
7079c3214d72
Scale lines when we zoom out
Neil Muller <drnlmuller@gmail.com>
parents:
435
diff
changeset
|
141 pygame.draw.lines(self._surface, color, False, pointlist, |
7079c3214d72
Scale lines when we zoom out
Neil Muller <drnlmuller@gmail.com>
parents:
435
diff
changeset
|
142 line_width) |
411 | 143 break |
144 if len(polygon) > 1: | |
51 | 145 pointlist = [self.point_to_pygame(p) for p in polygon] |
436
7079c3214d72
Scale lines when we zoom out
Neil Muller <drnlmuller@gmail.com>
parents:
435
diff
changeset
|
146 pygame.draw.lines(self._surface, color, False, pointlist, |
7079c3214d72
Scale lines when we zoom out
Neil Muller <drnlmuller@gmail.com>
parents:
435
diff
changeset
|
147 line_width) |
411 | 148 if index == mouse_poly and mouse_pos: |
424 | 149 endpoint = self.point_to_pymunk(mouse_pos) |
51 | 150 pygame.draw.line(self._surface, color, |
99 | 151 self.point_to_pygame(polygon[-1]), |
441 | 152 self.point_to_pygame(endpoint), |
153 line_width // 2) | |
407 | 154 line_found = False # Hack for sane behaviour if lines overlap |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
155 for line in self.lines: |
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
156 pointlist = [self.point_to_pygame(p) for p in line] |
407 | 157 if move_point_mode and not self._move_poly and not line_found: |
158 if move_point in line: | |
159 line_found = True | |
160 pointlist.remove(self.point_to_pygame(move_point)) | |
161 pointlist.append(mouse_pos) | |
436
7079c3214d72
Scale lines when we zoom out
Neil Muller <drnlmuller@gmail.com>
parents:
435
diff
changeset
|
162 pygame.draw.lines(self._surface, LINE_COLOR, False, pointlist, |
7079c3214d72
Scale lines when we zoom out
Neil Muller <drnlmuller@gmail.com>
parents:
435
diff
changeset
|
163 line_width) |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
164 if draw_cand_line and start_pos and mouse_pos: |
424 | 165 endpoint = self.snap_to_grid(mouse_pos) |
166 pointlist = [start_pos, | |
206 | 167 self.point_to_pygame(endpoint)] |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
168 pygame.draw.lines(self._surface, LINE_COLOR, False, pointlist, 1) |
432 | 169 return self._surface |
51 | 170 |
239 | 171 def reset_objs(self): |
172 # Reset the object state - needed when changing stuff | |
173 self.drawables = [] | |
174 self.overlay_drawables = [] | |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
175 self._glue = np.PuzzleGlue() |
239 | 176 for game_object_dict in self._game_objects: |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
177 obj = self._create_game_object(pymunk.Space(), **game_object_dict) |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
178 self.lookup[obj] = game_object_dict |
239 | 179 for enemy_dict in self._enemies: |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
180 obj = self._create_enemy(pymunk.Space(), **enemy_dict) |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
181 self.lookup[obj] = enemy_dict |
239 | 182 |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
183 def get_class(self, classname, mod=None): |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
184 # Get the class given the classname |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
185 modules = { |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
186 'game_object': ngo, |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
187 'enemies': ne, |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
188 'puzzle': np, |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
189 } |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
190 if '.' in classname: |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
191 modname, classname = classname.split('.') |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
192 mod = modules[modname] |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
193 if mod is None: |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
194 mod = ngo |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
195 return getattr(mod, classname) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
196 |
262
521f73061872
Better reporting of object errors. Fix incorrect assumption about ordering
Neil Muller <drnlmuller@gmail.com>
parents:
255
diff
changeset
|
197 def try_new_object(self, classname, target, new, old=None): |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
198 if old in target: |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
199 target.remove(old) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
200 try: |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
201 target.append(new) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
202 self.reset_objs() |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
203 return True |
262
521f73061872
Better reporting of object errors. Fix incorrect assumption about ordering
Neil Muller <drnlmuller@gmail.com>
parents:
255
diff
changeset
|
204 except Exception as e: |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
205 target.remove(new) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
206 if old is not None: |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
207 target.append(old) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
208 self.reset_objs() |
262
521f73061872
Better reporting of object errors. Fix incorrect assumption about ordering
Neil Muller <drnlmuller@gmail.com>
parents:
255
diff
changeset
|
209 alert("Failed to update object %s: %s" % (classname, e)) |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
210 return False |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
211 |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
212 def find_obj_at_pos(self, mouse_pos): |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
213 pymunk_pos = self.point_to_pymunk(mouse_pos) |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
214 # Search visible objects |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
215 for obj in self.drawables: |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
216 if obj.get_shape().point_query(pymunk_pos): |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
217 return obj |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
218 return None |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
219 |
407 | 220 def find_vertex(self, mouse_pos): |
221 # search for vertexes closest to where we've killed | |
222 mindist = 400 | |
223 move_point = None | |
224 search_point = self.point_to_pymunk(mouse_pos) | |
225 for index, polygon in self.polygons.items(): | |
226 for point in polygon: | |
227 dist = distance(point, search_point) | |
228 if dist < mindist: | |
229 mindist = dist | |
230 move_point = point | |
231 self._move_poly = index | |
232 # Also check lines | |
233 for line in self.lines: | |
234 for point in line: | |
235 dist = distance(point, search_point) | |
236 if dist < mindist: | |
237 mindist = dist | |
238 move_point = point | |
239 self._move_poly = None | |
240 return move_point | |
241 | |
242 def replace_vertex(self, old_point, new_point): | |
243 new_point = self.point_to_pymunk(new_point) | |
244 if self._move_poly: | |
245 new_polygon = [p if p != old_point else new_point for p in | |
246 self.polygons[self._move_poly]] | |
247 self.polygons[self._move_poly] = new_polygon | |
248 else: | |
249 for line in self.lines: | |
250 if old_point in line: | |
251 line.remove(old_point) | |
252 line.append(new_point) | |
253 break | |
254 | |
109
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
255 |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
256 class ObjectTable(TableView): |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
257 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
258 columns = [TableColumn("Object", 690, 'l', '%r')] |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
259 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
260 def __init__(self, data): |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
261 super(ObjectTable, self).__init__(height=450) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
262 self.data = data |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
263 self.selected_row = -1 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
264 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
265 def num_rows(self): |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
266 return len(self.data) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
267 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
268 def row_data(self, i): |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
269 data = self.data[i] |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
270 if 'name' in data: |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
271 return ('%s (%s)' % (data['classname'], data['name']), ) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
272 return (data['classname'], ) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
273 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
274 def row_is_selected(self, i): |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
275 return self.selected_row == i |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
276 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
277 def click_row(self, i, ev): |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
278 self.selected_row = i |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
279 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
280 def get_selection(self): |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
281 if self.selected_row >= 0: |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
282 return self.data[self.selected_row] |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
283 return None |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
284 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
285 |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
286 class EditClassDialog(Dialog): |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
287 |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
288 def __init__(self, classname, cls, data, level_widget, |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
289 delete=False): |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
290 super(EditClassDialog, self).__init__() |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
291 self.level_widget = level_widget |
255 | 292 self.classname = classname |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
293 self.rect = pygame.rect.Rect(0, 0, 900, 550) |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
294 title = Label("Editing %s" % classname) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
295 title.rect = pygame.rect.Rect(100, 10, 600, 25) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
296 self.add(title) |
262
521f73061872
Better reporting of object errors. Fix incorrect assumption about ordering
Neil Muller <drnlmuller@gmail.com>
parents:
255
diff
changeset
|
297 self.requires = cls.requires() |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
298 y = 40 |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
299 self.fields = {} |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
300 index = 0 |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
301 self.poly_field = None |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
302 self.needs_cleanup = False |
262
521f73061872
Better reporting of object errors. Fix incorrect assumption about ordering
Neil Muller <drnlmuller@gmail.com>
parents:
255
diff
changeset
|
303 for requirement, hint in self.requires: |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
304 label = Label(requirement) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
305 label.rect = pygame.rect.Rect(40, y, 200, 25) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
306 self.add(label) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
307 field = TextField() |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
308 field.rect = pygame.rect.Rect(220, y, 400, 25) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
309 self.add(field) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
310 if data is not None: |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
311 if requirement in data: |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
312 field.set_text('%s' % data[requirement]) |
255 | 313 elif 'args' in data and requirement != 'name': |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
314 # NB: The ordering assumptions in requires should make |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
315 # this safe, but it's really, really, really fragile |
255 | 316 try: |
317 field.set_text('%s' % data['args'][index]) | |
318 index += 1 | |
319 except IndexError: | |
320 # Assumed to be arguments with the default value | |
321 pass | |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
322 if hint.startswith('polygon'): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
323 self.poly_field = field |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
324 self.fields[requirement] = field |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
325 hintlabel = Label(hint) |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
326 hintlabel.rect = pygame.rect.Rect(640, y, 250, 25) |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
327 self.add(hintlabel) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
328 y += 30 |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
329 if self.poly_field: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
330 y += 20 |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
331 button = Button('Use Polygon 6', action=self.get_poly) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
332 button.rect = pygame.rect.Rect(350, y, 250, 30) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
333 self.add(button) |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
334 buttons = [] |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
335 if delete: |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
336 labels = ['OK', 'Delete', 'Cancel'] |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
337 else: |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
338 labels = ['OK', 'Cancel'] |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
339 for text in labels: |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
340 but = Button(text, action=lambda x=text: self.dismiss(x)) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
341 buttons.append(but) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
342 row = Row(buttons) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
343 row.rect = pygame.rect.Rect(250, 500, 700, 50) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
344 self.add(row) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
345 |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
346 def get_poly(self): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
347 try: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
348 data = self.level_widget.level.polygons[6][:] |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
349 except KeyError: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
350 data = [] |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
351 if data: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
352 # We unclose the polygon, because that's what pymunk |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
353 # wants |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
354 if data[0] == data[-1] and len(data) > 1: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
355 data.pop() |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
356 data = [list(x) for x in data] |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
357 self.needs_cleanup = True |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
358 self.poly_field.set_text('%s' % data) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
359 |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
360 def cleanup(self): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
361 if self.needs_cleanup: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
362 self.level_widget.level.polygons[6] = [] |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
363 self.level_widget.invalidate() |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
364 |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
365 def get_data(self): |
255 | 366 result = {} |
367 result['classname'] = self.classname | |
368 args = [] | |
369 # We arrange to bounce this through yaml'ish to convert | |
370 # stuff to the expected type | |
262
521f73061872
Better reporting of object errors. Fix incorrect assumption about ordering
Neil Muller <drnlmuller@gmail.com>
parents:
255
diff
changeset
|
371 for val, _ in self.requires: |
255 | 372 text = self.fields[val].get_text() |
373 if not text: | |
374 # skip empty fields | |
375 continue | |
376 if val == 'name': | |
377 result['name'] = text | |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
378 elif self.fields[val] == self.poly_field and text: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
379 # Evil, but faster than good |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
380 try: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
381 l = eval(text) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
382 args.append(' - - %s' % l[0]) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
383 for coord in l[1:]: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
384 args.append(' - %s' % coord) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
385 except Exception: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
386 alert("Invalid polygon %s" % text) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
387 self.needs_cleanup = False |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
388 return None |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
389 # Check for convexity |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
390 hull = pymunk.util.convex_hull(l) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
391 if hull != l: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
392 alert("Invalid polygon %s - not convex" % text) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
393 return None |
255 | 394 else: |
395 args.append(' - ' + text) | |
396 data = "args:\n" + '\n'.join(args) | |
397 result['args'] = load_s(data)['args'] | |
398 return result | |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
399 |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
400 |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
401 class LevelWidget(Widget): |
51 | 402 |
280 | 403 def __init__(self, level, parent): |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
404 super(LevelWidget, self).__init__(pygame.rect.Rect(0, 0, |
109
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
405 SCREEN[0], SCREEN[1])) |
51 | 406 self.level = level |
407 self.pos = (0, 0) | |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
408 self.filled_mode = False |
51 | 409 self.mouse_pos = None |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
410 self.cur_poly = None |
167
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
411 self._mouse_drag = False |
199
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
412 self._draw_objects = False |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
413 self._draw_enemies = False |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
414 self._draw_lines = False |
419 | 415 self.grid_size = 1 |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
416 self.sel_mode = False |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
417 self._start_pos = None |
280 | 418 self._parent = parent |
407 | 419 self._move_point_mode = False |
420 self._move_point = False | |
413 | 421 self._zoom_factor = 1.0 |
51 | 422 |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
423 def _level_coordinates(self, pos): |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
424 # Move positions to level values |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
425 if not pos: |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
426 return (0, 0) |
413 | 427 # Apply zoom_factor |
428 zoomed = (pos[0] * self._zoom_factor, pos[1] * self._zoom_factor) | |
435 | 429 return int(zoomed[0] + self.pos[0]), int(zoomed[1] + self.pos[1]) |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
430 |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
431 def _move_view(self, offset): |
51 | 432 new_pos = [self.pos[0] + offset[0], self.pos[1] + offset[1]] |
433 if new_pos[0] < 0: | |
434 new_pos[0] = self.pos[0] | |
435 elif new_pos[0] > self.level.x - SCREEN[0]: | |
436 new_pos[0] = self.pos[0] | |
437 if new_pos[1] < 0: | |
438 new_pos[1] = self.pos[1] | |
439 elif new_pos[1] > self.level.y - SCREEN[1]: | |
440 new_pos[1] = self.pos[1] | |
441 self.pos = tuple(new_pos) | |
442 | |
419 | 443 def inc_grid_size(self, amount): |
444 self.grid_size = max(1, self.grid_size + amount) | |
426 | 445 if self.grid_size > 1: |
446 self.grid_size = self.grid_size - (self.grid_size % 5) | |
419 | 447 |
424 | 448 def snap_to_grid(self, pos): |
449 x = pos[0] - (pos[0] % self.grid_size) | |
450 y = pos[1] - (pos[1] % self.grid_size) | |
451 return (x, y) | |
452 | |
199
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
453 def set_objects(self, value): |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
454 if self._draw_objects != value: |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
455 self._draw_objects = value |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
456 self.invalidate() |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
457 |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
458 def set_enemies(self, value): |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
459 if self._draw_enemies != value: |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
460 self._draw_enemies = value |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
461 self.invalidate() |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
462 |
413 | 463 def zoom_out(self): |
464 self._zoom_factor = self._zoom_factor * 2.0 | |
465 if self._zoom_factor > 8: | |
466 self._zoom_factor = 8 | |
467 | |
468 def zoom_in(self): | |
469 self._zoom_factor = self._zoom_factor // 2.0 | |
470 if self._zoom_factor < 1: | |
471 self._zoom_factor = 1 | |
472 | |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
473 def draw(self, surface): |
51 | 474 if (self.cur_poly is not None and self.cur_poly in self.level.polygons |
475 and len(self.level.polygons[self.cur_poly])): | |
476 # We have an active polygon | |
477 mouse_pos = self._level_coordinates(self.mouse_pos) | |
424 | 478 mouse_pos = self.snap_to_grid(mouse_pos) |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
479 elif self._draw_lines: |
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
480 # Interior wall mode |
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
481 mouse_pos = self._level_coordinates(self.mouse_pos) |
424 | 482 mouse_pos = self.snap_to_grid(mouse_pos) |
407 | 483 elif self._move_point_mode: |
484 mouse_pos = self._level_coordinates(self.mouse_pos) | |
424 | 485 mouse_pos = self.snap_to_grid(mouse_pos) |
51 | 486 else: |
487 mouse_pos = None | |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
488 level_surface = level.draw(mouse_pos, self.cur_poly, self.filled_mode, |
407 | 489 self._draw_lines, self._start_pos, |
436
7079c3214d72
Scale lines when we zoom out
Neil Muller <drnlmuller@gmail.com>
parents:
435
diff
changeset
|
490 self._move_point_mode, self._move_point, |
7079c3214d72
Scale lines when we zoom out
Neil Muller <drnlmuller@gmail.com>
parents:
435
diff
changeset
|
491 self._zoom_factor) |
199
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
492 if self._draw_objects: |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
493 for thing in self.level.drawables: |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
494 if not isinstance(thing, ne.Enemy): |
199
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
495 thing.render(level_surface) |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
496 if self._draw_enemies: |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
497 for thing in self.level.drawables: |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
498 if isinstance(thing, ne.Enemy): |
199
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
499 thing.render(level_surface) |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
500 surface_area = pygame.rect.Rect(self.pos, SCREEN) |
413 | 501 zoomed_surface = level_surface.copy() |
432 | 502 if self._zoom_factor != 1: |
503 zoomed_surface = pygame.transform.scale( | |
504 level_surface, | |
433 | 505 (int(level_surface.get_width() / self._zoom_factor), |
506 int(level_surface.get_height() / self._zoom_factor))) | |
413 | 507 surface.blit(zoomed_surface, (0, 0), surface_area) |
51 | 508 |
115 | 509 def change_poly(self, new_poly): |
510 self.cur_poly = new_poly | |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
511 self._draw_lines = False |
115 | 512 if self.cur_poly is not None: |
280 | 513 self._parent.reset_lit_buttons() |
115 | 514 self.filled_mode = False |
515 | |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
516 def line_mode(self): |
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
517 self.cur_poly = None |
280 | 518 self._parent.reset_lit_buttons() |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
519 self._draw_lines = True |
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
520 self.filled_mode = False |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
521 self._start_pos = None |
407 | 522 self._move_point_mode = False |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
523 |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
524 def key_down(self, ev): |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
525 if ev.key == pgl.K_LEFT: |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
526 self._move_view((-10, 0)) |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
527 elif ev.key == pgl.K_RIGHT: |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
528 self._move_view((10, 0)) |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
529 elif ev.key == pgl.K_UP: |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
530 self._move_view((0, -10)) |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
531 elif ev.key == pgl.K_DOWN: |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
532 self._move_view((0, 10)) |
115 | 533 elif ev.key in (pgl.K_1, pgl.K_2, pgl.K_3, pgl.K_4, pgl.K_5, pgl.K_6): |
534 self.change_poly(ev.key - pgl.K_0) | |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
535 elif ev.key == pgl.K_0: |
115 | 536 self.change_poly(None) |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
537 elif ev.key == pgl.K_d and self.cur_poly: |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
538 self.level.delete_point(self.cur_poly) |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
539 elif ev.key == pgl.K_f: |
117 | 540 self.set_filled() |
135
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
541 elif ev.key == pgl.K_c: |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
542 self.close_poly() |
117 | 543 |
407 | 544 def set_move_mode(self): |
545 self._draw_lines = False | |
546 self._move_point_mode = True | |
547 self.filled_mode = False | |
548 self._parent.reset_lit_buttons() | |
549 self._move_point = None | |
550 | |
117 | 551 def set_filled(self): |
165
dba8bc454a43
Fix 'fill exterior' button
Neil Muller <drnlmuller@gmail.com>
parents:
157
diff
changeset
|
552 closed, _ = self.level.all_closed() |
dba8bc454a43
Fix 'fill exterior' button
Neil Muller <drnlmuller@gmail.com>
parents:
157
diff
changeset
|
553 if closed: |
117 | 554 self.cur_poly = None |
280 | 555 self._parent.reset_lit_buttons() |
117 | 556 self.filled_mode = True |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
557 self._draw_lines = False |
407 | 558 self._move_point_mode = False |
117 | 559 else: |
165
dba8bc454a43
Fix 'fill exterior' button
Neil Muller <drnlmuller@gmail.com>
parents:
157
diff
changeset
|
560 alert('Not all polygons closed, so not filling') |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
561 |
109
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
562 def mouse_move(self, ev): |
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
563 old_pos = self.mouse_pos |
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
564 self.mouse_pos = ev.pos |
407 | 565 if old_pos != self.mouse_pos and (self.cur_poly or self._draw_lines |
421 | 566 or self._move_point_mode): |
109
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
567 self.invalidate() |
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
568 |
167
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
569 def mouse_drag(self, ev): |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
570 if self._mouse_drag: |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
571 old_pos = self.mouse_pos |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
572 self.mouse_pos = ev.pos |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
573 diff = (-self.mouse_pos[0] + old_pos[0], |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
574 -self.mouse_pos[1] + old_pos[1]) |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
575 self._move_view(diff) |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
576 self.invalidate() |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
577 |
109
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
578 def mouse_down(self, ev): |
414 | 579 corrected_pos = self._level_coordinates(ev.pos) |
424 | 580 snapped_pos = self.snap_to_grid(corrected_pos) |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
581 if self.sel_mode and ev.button == 1: |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
582 obj = self.level.find_obj_at_pos(corrected_pos) |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
583 if obj is not None: |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
584 self._edit_selected(obj) |
407 | 585 elif self._move_point_mode and ev.button == 1: |
586 if self._move_point: | |
587 # Place the current point | |
424 | 588 self.level.replace_vertex(self._move_point, snapped_pos) |
407 | 589 self._move_point = None |
590 self.invalidate() | |
591 else: | |
592 # find the current point | |
424 | 593 self._move_point = self.level.find_vertex(snapped_pos) |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
594 elif ev.button == 1: |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
595 if self._draw_lines: |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
596 if self._start_pos is None: |
414 | 597 self._start_pos = corrected_pos |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
598 else: |
424 | 599 self.level.add_line(self._start_pos, snapped_pos) |
205
51f979ddddbb
Munge in interior wall drawing
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
600 self._start_pos = None |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
601 else: |
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
602 print "Click: %r" % ( |
414 | 603 self.level.point_to_pymunk(corrected_pos),) |
157 | 604 if ev.button == 4: # Scroll up |
605 self._move_view((0, -10)) | |
606 elif ev.button == 5: # Scroll down | |
607 self._move_view((0, 10)) | |
608 elif ev.button == 6: # Scroll left | |
609 self._move_view((-10, 0)) | |
610 elif ev.button == 7: # Scroll right | |
611 self._move_view((10, 0)) | |
413 | 612 elif self.cur_poly and ev.button == 1: |
613 # Add a point | |
439
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
614 if not self.level.add_point(self.cur_poly, snapped_pos): |
4c60df80b91b
Don't allow placing points outside the level
Neil Muller <drnlmuller@gmail.com>
parents:
436
diff
changeset
|
615 alert("Failed to place point") |
167
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
616 elif ev.button == 3: |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
617 self._mouse_drag = True |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
618 |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
619 def mouse_up(self, ev): |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
620 if ev.button == 3: |
bb297f3f99f4
Allow using right mouse button to drag level display
Neil Muller <drnlmuller@gmail.com>
parents:
166
diff
changeset
|
621 self._mouse_drag = False |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
622 |
135
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
623 def close_poly(self): |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
624 if self.cur_poly is None: |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
625 return |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
626 if self.level.close_poly(self.cur_poly): |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
627 alert("Successfully closed the polygon") |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
628 self.change_poly(None) |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
629 else: |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
630 alert("Failed to close the polygon") |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
631 |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
632 def _edit_class(self, classname, cls, data): |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
633 # Dialog for class properties |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
634 dialog = EditClassDialog(classname, cls, data, self) |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
635 if dialog.present() == 'OK': |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
636 return dialog |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
637 return None |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
638 |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
639 def _edit_selected(self, obj): |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
640 data = self.level.lookup[obj] |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
641 cls = obj.__class__ |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
642 classname = obj.__class__.__name__ |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
643 dialog = EditClassDialog(classname, cls, data, self, True) |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
644 res = dialog.present() |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
645 if res == 'OK': |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
646 edited = dialog.get_data() |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
647 if edited is not None: |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
648 for target in [self.level._game_objects, self.level._enemies]: |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
649 if data in target: |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
650 if self.level.try_new_object(classname, target, |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
651 edited, data): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
652 dialog.cleanup() |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
653 break |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
654 elif res == 'Delete': |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
655 for target in [self.level._game_objects, self.level._enemies]: |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
656 if data in target: |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
657 target.remove(data) |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
658 self.level.reset_objs() |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
659 break |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
660 |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
661 def _make_edit_dialog(self, entries): |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
662 # Dialog to hold the editor |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
663 edit_box = Dialog() |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
664 edit_box.rect = pygame.rect.Rect(0, 0, 700, 500) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
665 table = ObjectTable(entries) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
666 edit_box.add(table) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
667 buttons = [] |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
668 for text in ['OK', 'Delete', 'Cancel']: |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
669 but = Button(text, action=lambda x=text: edit_box.dismiss(x)) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
670 buttons.append(but) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
671 row = Row(buttons) |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
672 row.rect = pygame.rect.Rect(250, 450, 700, 50) |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
673 edit_box.add(row) |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
674 edit_box.get_selection = lambda: table.get_selection() |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
675 return edit_box |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
676 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
677 def edit_objects(self): |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
678 edit_box = self._make_edit_dialog(self.level._game_objects) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
679 res = edit_box.present() |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
680 choice = edit_box.get_selection() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
681 if choice is None: |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
682 return |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
683 if res == 'OK': |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
684 cls = self.level.get_class(choice['classname']) |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
685 edit_dlg = self._edit_class(choice['classname'], cls, choice) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
686 if edit_dlg is not None: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
687 edited = edit_dlg.get_data() |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
688 if self.level.try_new_object(choice["classname"], |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
689 self.level._game_objects, |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
690 edited, choice): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
691 edit_dlg.cleanup() |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
692 elif res == 'Delete': |
239 | 693 self.level._game_objects.remove(choice) |
694 self.level.reset_objs() | |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
695 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
696 def edit_enemies(self): |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
697 edit_box = self._make_edit_dialog(self.level._enemies) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
698 res = edit_box.present() |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
699 choice = edit_box.get_selection() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
700 if choice is None: |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
701 return |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
702 if res == 'OK': |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
703 cls = self.level.get_class(choice['classname'], ne) |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
704 edit_dlg = self._edit_class(choice['classname'], cls, choice) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
705 if edit_dlg is not None: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
706 edited = edit_dlg.get_data() |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
707 if self.level.try_new_object(choice["classname"], |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
708 self.level._enemies, |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
709 edited, choice): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
710 edit_dlg.cleanup() |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
711 elif res == 'Delete': |
239 | 712 self.level._enemies.remove(choice) |
713 self.level.reset_objs() | |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
714 |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
715 def _make_choice_dialog(self, classes): |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
716 # Dialog to hold the editor |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
717 data = [] |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
718 for cls_name, cls in classes: |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
719 data.append({"classname": cls_name, "class": cls}) |
239 | 720 choice_box = Dialog() |
721 choice_box.rect = pygame.rect.Rect(0, 0, 700, 500) | |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
722 table = ObjectTable(data) |
239 | 723 choice_box.add(table) |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
724 buttons = [] |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
725 for text in ['OK', 'Cancel']: |
239 | 726 but = Button(text, action=lambda x=text: choice_box.dismiss(x)) |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
727 buttons.append(but) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
728 row = Row(buttons) |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
729 row.rect = pygame.rect.Rect(250, 450, 700, 50) |
239 | 730 choice_box.add(row) |
731 choice_box.get_selection = lambda: table.get_selection() | |
732 return choice_box | |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
733 |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
734 def add_game_object(self): |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
735 classes = ngo.get_editable_game_objects() |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
736 choose = self._make_choice_dialog(classes) |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
737 res = choose.present() |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
738 choice = choose.get_selection() |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
739 if res == 'OK' and choice is not None: |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
740 classname = choice['classname'] |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
741 cls = choice['class'] |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
742 edit_dlg = self._edit_class(classname, cls, None) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
743 if edit_dlg is not None: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
744 new_cls = edit_dlg.get_data() |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
745 if self.level.try_new_object(classname, |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
746 self.level._game_objects, |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
747 new_cls, None): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
748 edit_dlg.cleanup() |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
749 |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
750 def add_enemy(self): |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
751 classes = ne.get_editable_enemies() |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
752 choose = self._make_choice_dialog(classes) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
753 res = choose.present() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
754 choice = choose.get_selection() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
755 if res == 'OK' and choice is not None: |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
756 classname = choice['classname'] |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
757 cls = choice['class'] |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
758 edit_dlg = self._edit_class(classname, cls, None) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
759 if edit_dlg is not None: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
760 new_cls = edit_dlg.get_data() |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
761 if self.level.try_new_object(classname, self.level._enemies, |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
762 new_cls, None): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
763 edit_dlg.cleanup() |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
764 |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
765 def add_puzzler(self): |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
766 classes = np.get_editable_puzzlers() |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
767 choose = self._make_choice_dialog(classes) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
768 res = choose.present() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
769 choice = choose.get_selection() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
770 if res == 'OK' and choice is not None: |
251
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
771 classname = choice['classname'] |
611370331bd1
Add framework of edit object dialog
Neil Muller <drnlmuller@gmail.com>
parents:
239
diff
changeset
|
772 cls = choice['class'] |
355
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
773 edit_dlg = self._edit_class(classname, cls, None) |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
774 if edit_dlg is not None: |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
775 new_cls = edit_dlg.get_data() |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
776 if self.level.try_new_object(classname, |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
777 self.level._game_objects, |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
778 new_cls, None): |
9589e1db4433
Allow copying polygon 6 into terrain objects
Neil Muller <drnlmuller@gmail.com>
parents:
330
diff
changeset
|
779 edit_dlg.cleanup() |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
780 |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
781 |
280 | 782 class HighLightButton(Button): |
783 """Button with highlight support""" | |
784 def __init__(self, text, parent, **kwds): | |
785 super(HighLightButton, self).__init__(text, **kwds) | |
786 self._parent = parent | |
787 | |
788 def highlight(self): | |
789 self.border_color = pygame.color.Color('red') | |
790 | |
791 def reset(self): | |
792 self.border_color = self.fg_color | |
793 | |
794 | |
795 class PolyButton(HighLightButton): | |
115 | 796 """Button for coosing the correct polygon""" |
797 | |
280 | 798 def __init__(self, index, level_widget, parent): |
115 | 799 if index is not None: |
800 text = "Draw: %s" % index | |
801 else: | |
802 text = 'Exit Draw Mode' | |
280 | 803 super(PolyButton, self).__init__(text, parent) |
115 | 804 self.index = index |
805 self.level_widget = level_widget | |
806 | |
807 def action(self): | |
808 self.level_widget.change_poly(self.index) | |
280 | 809 self._parent.reset_lit_buttons() |
810 if self.index is not None: | |
811 self.highlight() | |
115 | 812 |
813 | |
419 | 814 class GridSizeLabel(Label): |
815 """Label and setter for grid size.""" | |
816 | |
817 def __init__(self, level_widget, **kwds): | |
818 self.level_widget = level_widget | |
819 super(GridSizeLabel, self).__init__(self.grid_text(), **kwds) | |
820 | |
821 def grid_text(self): | |
822 return "Grid size: %d" % self.level_widget.grid_size | |
823 | |
824 def inc_grid_size(self, amount): | |
825 self.level_widget.inc_grid_size(amount) | |
826 self.set_text(self.grid_text()) | |
827 | |
828 | |
829 class SnapButton(Button): | |
830 """Button for increasing or decreasing snap-to-grid size.""" | |
831 | |
832 def __init__(self, grid_size_label, parent, inc_amount): | |
833 self.grid_size_label = grid_size_label | |
834 self.inc_amount = inc_amount | |
835 text = "Grid %s%d" % ( | |
836 '-' if inc_amount < 0 else '+', | |
837 abs(inc_amount)) | |
838 self._parent = parent | |
839 super(SnapButton, self).__init__(text) | |
840 | |
841 def action(self): | |
842 self.grid_size_label.inc_grid_size(self.inc_amount) | |
843 | |
844 | |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
845 class EditorApp(RootWidget): |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
846 |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
847 def __init__(self, level, surface): |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
848 super(EditorApp, self).__init__(surface) |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
849 self.level = level |
280 | 850 self.level_widget = LevelWidget(self.level, self) |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
851 self.add(self.level_widget) |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
852 |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
853 self._dMenus = {} |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
854 |
280 | 855 self._light_buttons = [] |
856 | |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
857 self._make_draw_menu() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
858 self._make_objects_menu() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
859 |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
860 self._menu_mode = 'drawing' |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
861 self._populate_menu() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
862 |
413 | 863 self._zoom = 1 |
864 | |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
865 def _make_draw_menu(self): |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
866 widgets = [] |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
867 |
419 | 868 white = pygame.color.Color("white") |
869 | |
115 | 870 # Add poly buttons |
423 | 871 y = 5 |
115 | 872 for poly in range(1, 7): |
280 | 873 but = PolyButton(poly, self.level_widget, self) |
115 | 874 but.rect = pygame.rect.Rect(0, 0, MENU_WIDTH // 2 - MENU_PAD, |
875 MENU_BUTTON_HEIGHT) | |
876 if poly % 2: | |
877 but.rect.move_ip(MENU_LEFT, y) | |
878 else: | |
879 but.rect.move_ip(MENU_LEFT + MENU_WIDTH // 2 - MENU_HALF_PAD, | |
880 y) | |
881 y += MENU_BUTTON_HEIGHT + MENU_PAD | |
280 | 882 self._light_buttons.append(but) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
883 widgets.append(but) |
198 | 884 |
280 | 885 end_poly_but = PolyButton(None, self.level_widget, self) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
886 end_poly_but.rect = BUTTON_RECT.copy() |
115 | 887 end_poly_but.rect.move_ip(MENU_LEFT, y) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
888 widgets.append(end_poly_but) |
115 | 889 y += MENU_BUTTON_HEIGHT + MENU_PAD |
890 | |
407 | 891 self.move_point_but = HighLightButton("Move Point", self, |
892 action=self.move_point) | |
893 self.move_point_but.rect = BUTTON_RECT.copy() | |
894 self.move_point_but.rect.move_ip(MENU_LEFT, y) | |
895 widgets.append(self.move_point_but) | |
896 self._light_buttons.append(self.move_point_but) | |
423 | 897 y += MENU_BUTTON_HEIGHT + MENU_PAD |
419 | 898 |
899 # grid size widgets | |
900 grid_size_label = GridSizeLabel( | |
901 self.level_widget, width=BUTTON_RECT.width, | |
902 align="c", fg_color=white) | |
903 grid_size_label.rect.move_ip(MENU_LEFT, y) | |
904 widgets.append(grid_size_label) | |
905 y += grid_size_label.rect.height + MENU_PAD | |
426 | 906 inc_snap_but = SnapButton(grid_size_label, self, 5) |
419 | 907 inc_snap_but.rect = HALF_BUTTON_RECT.copy() |
908 inc_snap_but.rect.move_ip(MENU_LEFT, y) | |
909 widgets.append(inc_snap_but) | |
426 | 910 dec_snap_but = SnapButton(grid_size_label, self, -5) |
419 | 911 dec_snap_but.rect = HALF_BUTTON_RECT.copy() |
912 dec_snap_but.rect.move_ip( | |
913 MENU_LEFT + MENU_HALF_WIDTH, y) | |
914 widgets.append(dec_snap_but) | |
407 | 915 y += MENU_BUTTON_HEIGHT + MENU_PAD |
916 | |
280 | 917 self.draw_line_but = HighLightButton("Draw interior wall", self, |
918 action=self.set_line_mode) | |
919 self.draw_line_but.rect = BUTTON_RECT.copy() | |
920 self.draw_line_but.rect.move_ip(MENU_LEFT, y) | |
921 widgets.append(self.draw_line_but) | |
922 self._light_buttons.append(self.draw_line_but) | |
204
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
923 y += MENU_BUTTON_HEIGHT + MENU_PAD |
687459429550
Display interior walls and start working towards drawing them
Neil Muller <drnlmuller@gmail.com>
parents:
199
diff
changeset
|
924 |
117 | 925 fill_but = Button('Fill exterior', action=self.level_widget.set_filled) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
926 fill_but.rect = BUTTON_RECT.copy() |
117 | 927 fill_but.rect.move_ip(MENU_LEFT, y) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
928 widgets.append(fill_but) |
117 | 929 y += MENU_BUTTON_HEIGHT + MENU_PAD |
930 | |
135
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
931 close_poly_but = Button('Close Polygon', |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
932 action=self.level_widget.close_poly) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
933 close_poly_but.rect = BUTTON_RECT.copy() |
135
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
934 close_poly_but.rect.move_ip(MENU_LEFT, y) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
935 widgets.append(close_poly_but) |
135
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
936 y += MENU_BUTTON_HEIGHT + MENU_PAD |
c9b6685ebebf
Add hack'ish 'close polygon' option
Neil Muller <drnlmuller@gmail.com>
parents:
134
diff
changeset
|
937 |
198 | 938 self.show_objs = CheckBox(fg_color=white) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
939 self.show_objs.rect = CHECK_RECT.copy() |
198 | 940 self.show_objs.rect.move_ip(MENU_LEFT, y) |
941 label = Label("Show Objects", fg_color=white) | |
942 label.rect.move_ip(MENU_LEFT + MENU_BUTTON_HEIGHT // 2 + MENU_PAD, y) | |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
943 widgets.append(self.show_objs) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
944 widgets.append(label) |
198 | 945 y += label.rect.height + MENU_PAD |
946 | |
947 self.show_enemies = CheckBox(fg_color=white) | |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
948 self.show_enemies.rect = CHECK_RECT.copy() |
198 | 949 self.show_enemies.rect.move_ip(MENU_LEFT, y) |
950 label = Label("Show enemy start pos", fg_color=white) | |
951 label.rect.move_ip(MENU_LEFT + MENU_BUTTON_HEIGHT // 2 + MENU_PAD, y) | |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
952 widgets.append(self.show_enemies) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
953 widgets.append(label) |
198 | 954 y += label.rect.height + MENU_PAD |
955 | |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
956 y += MENU_PAD |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
957 switch_but = Button('Switch to Objects', action=self.switch_to_objects) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
958 switch_but.rect = BUTTON_RECT.copy() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
959 switch_but.rect.move_ip(MENU_LEFT, y) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
960 widgets.append(switch_but) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
961 y += switch_but.rect.height + MENU_PAD |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
962 |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
963 save_but = Button('Save Level', action=self.save) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
964 save_but.rect = BUTTON_RECT.copy() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
965 save_but.rect.move_ip(MENU_LEFT, y) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
966 widgets.append(save_but) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
967 y += MENU_BUTTON_HEIGHT + MENU_PAD |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
968 |
413 | 969 zoom_out = Button('Zoom out', action=self.level_widget.zoom_out) |
970 zoom_out.rect = BUTTON_RECT.copy() | |
422
6925f540a0c6
Tweak zoom button layout
Neil Muller <drnlmuller@gmail.com>
parents:
421
diff
changeset
|
971 zoom_out.rect.width = zoom_out.rect.width // 2 |
413 | 972 zoom_out.rect.move_ip(MENU_LEFT, y) |
973 widgets.append(zoom_out) | |
974 | |
975 zoom_in = Button('Zoom in', action=self.level_widget.zoom_in) | |
976 zoom_in.rect = BUTTON_RECT.copy() | |
422
6925f540a0c6
Tweak zoom button layout
Neil Muller <drnlmuller@gmail.com>
parents:
421
diff
changeset
|
977 zoom_in.width = zoom_in.width // 2 |
6925f540a0c6
Tweak zoom button layout
Neil Muller <drnlmuller@gmail.com>
parents:
421
diff
changeset
|
978 zoom_in.rect.move_ip(MENU_LEFT + zoom_out.width, y) |
413 | 979 widgets.append(zoom_in) |
980 | |
330
6e32494b9f9e
Move quit button away from other stuff
Neil Muller <drnlmuller@gmail.com>
parents:
315
diff
changeset
|
981 y = SCREEN[1] - MENU_BUTTON_HEIGHT - MENU_PAD |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
982 quit_but = Button('Quit', action=self.quit) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
983 quit_but.rect = BUTTON_RECT.copy() |
115 | 984 quit_but.rect.move_ip(MENU_LEFT, y) |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
985 widgets.append(quit_but) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
986 |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
987 self._dMenus['drawing'] = widgets |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
988 |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
989 def _make_objects_menu(self): |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
990 widgets = [] |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
991 |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
992 # Add poly buttons |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
993 y = 15 |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
994 |
225
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
995 edit_objs_but = Button('Edit Objects', |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
996 action=self.level_widget.edit_objects) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
997 edit_objs_but.rect = BUTTON_RECT.copy() |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
998 edit_objs_but.rect.move_ip(MENU_LEFT, y) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
999 widgets.append(edit_objs_but) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
1000 y += MENU_BUTTON_HEIGHT + MENU_PAD |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
1001 |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
1002 edir_enemies_but = Button('Edit Enemies', |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
1003 action=self.level_widget.edit_enemies) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
1004 edir_enemies_but.rect = BUTTON_RECT.copy() |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
1005 edir_enemies_but.rect.move_ip(MENU_LEFT, y) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
1006 widgets.append(edir_enemies_but) |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
1007 y += MENU_BUTTON_HEIGHT + MENU_PAD |
c8ead015c48e
Display list of objects to edit / delete
Neil Muller <drnlmuller@gmail.com>
parents:
223
diff
changeset
|
1008 |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1009 add_obj_but = Button('Add Game Object', |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1010 action=self.level_widget.add_game_object) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1011 add_obj_but.rect = BUTTON_RECT.copy() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1012 add_obj_but.rect.move_ip(MENU_LEFT, y) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1013 widgets.append(add_obj_but) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1014 y += MENU_BUTTON_HEIGHT + MENU_PAD |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1015 |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1016 add_puzzle_but = Button('Add Puzzler', |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1017 action=self.level_widget.add_puzzler) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1018 add_puzzle_but.rect = BUTTON_RECT.copy() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1019 add_puzzle_but.rect.move_ip(MENU_LEFT, y) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1020 widgets.append(add_puzzle_but) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1021 y += MENU_BUTTON_HEIGHT + MENU_PAD |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1022 |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1023 add_enemy_but = Button('Add Enemy', |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1024 action=self.level_widget.add_enemy) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1025 add_enemy_but.rect = BUTTON_RECT.copy() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1026 add_enemy_but.rect.move_ip(MENU_LEFT, y) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1027 widgets.append(add_enemy_but) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1028 y += MENU_BUTTON_HEIGHT + MENU_PAD |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1029 |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1030 y += MENU_PAD |
280 | 1031 self.sel_mode_but = HighLightButton('Select Object', self, |
1032 action=self.sel_mode) | |
1033 self.sel_mode_but.rect = BUTTON_RECT.copy() | |
1034 self.sel_mode_but.rect.move_ip(MENU_LEFT, y) | |
1035 widgets.append(self.sel_mode_but) | |
1036 self._light_buttons.append(self.sel_mode_but) | |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
1037 y += MENU_BUTTON_HEIGHT + MENU_PAD |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
1038 |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
1039 y += MENU_PAD |
236
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1040 switch_but = Button('Switch to Drawing', action=self.switch_to_draw) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1041 switch_but.rect = BUTTON_RECT.copy() |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1042 switch_but.rect.move_ip(MENU_LEFT, y) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1043 widgets.append(switch_but) |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1044 y += switch_but.rect.height + MENU_PAD |
261fd65a8816
More work towards object editing
Neil Muller <drnlmuller@gmail.com>
parents:
225
diff
changeset
|
1045 |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1046 save_but = Button('Save Level', action=self.save) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1047 save_but.rect = BUTTON_RECT.copy() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1048 save_but.rect.move_ip(MENU_LEFT, y) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1049 widgets.append(save_but) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1050 y += MENU_BUTTON_HEIGHT + MENU_PAD |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1051 |
414 | 1052 zoom_out = Button('Zoom out', action=self.level_widget.zoom_out) |
1053 zoom_out.rect = BUTTON_RECT.copy() | |
422
6925f540a0c6
Tweak zoom button layout
Neil Muller <drnlmuller@gmail.com>
parents:
421
diff
changeset
|
1054 zoom_out.rect.width = zoom_out.rect.width // 2 |
414 | 1055 zoom_out.rect.move_ip(MENU_LEFT, y) |
1056 widgets.append(zoom_out) | |
1057 | |
1058 zoom_in = Button('Zoom in', action=self.level_widget.zoom_in) | |
1059 zoom_in.rect = BUTTON_RECT.copy() | |
422
6925f540a0c6
Tweak zoom button layout
Neil Muller <drnlmuller@gmail.com>
parents:
421
diff
changeset
|
1060 zoom_in.width = zoom_in.width // 2 |
6925f540a0c6
Tweak zoom button layout
Neil Muller <drnlmuller@gmail.com>
parents:
421
diff
changeset
|
1061 zoom_in.rect.move_ip(MENU_LEFT + zoom_out.width, y) |
414 | 1062 widgets.append(zoom_in) |
422
6925f540a0c6
Tweak zoom button layout
Neil Muller <drnlmuller@gmail.com>
parents:
421
diff
changeset
|
1063 y += MENU_BUTTON_HEIGHT + MENU_PAD |
414 | 1064 |
330
6e32494b9f9e
Move quit button away from other stuff
Neil Muller <drnlmuller@gmail.com>
parents:
315
diff
changeset
|
1065 y = SCREEN[1] - MENU_BUTTON_HEIGHT - MENU_PAD |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1066 quit_but = Button('Quit', action=self.quit) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1067 quit_but.rect = BUTTON_RECT.copy() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1068 quit_but.rect.move_ip(MENU_LEFT, y) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1069 widgets.append(quit_but) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1070 |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1071 self._dMenus['objects'] = widgets |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
1072 |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
1073 def key_down(self, ev): |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
1074 if ev.key == pgl.K_ESCAPE: |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
1075 self.quit() |
116 | 1076 elif ev.key == pgl.K_s: |
1077 self.save() | |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
1078 else: |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
1079 self.level_widget.key_down(ev) |
51 | 1080 |
116 | 1081 def save(self): |
122
02423600d958
Use dialogs to report save results
Neil Muller <drnlmuller@gmail.com>
parents:
117
diff
changeset
|
1082 closed, messages = self.level.all_closed() |
02423600d958
Use dialogs to report save results
Neil Muller <drnlmuller@gmail.com>
parents:
117
diff
changeset
|
1083 if closed: |
02423600d958
Use dialogs to report save results
Neil Muller <drnlmuller@gmail.com>
parents:
117
diff
changeset
|
1084 self.level.save() |
02423600d958
Use dialogs to report save results
Neil Muller <drnlmuller@gmail.com>
parents:
117
diff
changeset
|
1085 # display success |
02423600d958
Use dialogs to report save results
Neil Muller <drnlmuller@gmail.com>
parents:
117
diff
changeset
|
1086 alert("Level %s saved successfully." % self.level.name) |
02423600d958
Use dialogs to report save results
Neil Muller <drnlmuller@gmail.com>
parents:
117
diff
changeset
|
1087 else: |
02423600d958
Use dialogs to report save results
Neil Muller <drnlmuller@gmail.com>
parents:
117
diff
changeset
|
1088 # display errors |
02423600d958
Use dialogs to report save results
Neil Muller <drnlmuller@gmail.com>
parents:
117
diff
changeset
|
1089 alert("Failed to save level.\n\n%s" % '\n'.join(messages)) |
116 | 1090 |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1091 def switch_to_draw(self): |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1092 if self._menu_mode != 'drawing': |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1093 self._clear_menu() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1094 self._menu_mode = 'drawing' |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1095 self._populate_menu() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1096 |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1097 def switch_to_objects(self): |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1098 if self._menu_mode != 'objects': |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1099 self._clear_menu() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1100 self._menu_mode = 'objects' |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1101 self._populate_menu() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1102 |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1103 def _clear_menu(self): |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1104 for widget in self._dMenus[self._menu_mode]: |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1105 self.remove(widget) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1106 |
280 | 1107 def reset_lit_buttons(self): |
1108 for but in self._light_buttons: | |
1109 but.reset() | |
1110 | |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1111 def _populate_menu(self): |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1112 self.level_widget.change_poly(None) |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
1113 self.level_widget.sel_mode = False |
220
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1114 for widget in self._dMenus[self._menu_mode]: |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1115 self.add(widget) |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1116 self.invalidate() |
06c52529e2ed
Add placeholder object mode menu
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
1117 |
280 | 1118 def set_line_mode(self): |
1119 self.level_widget.line_mode() | |
1120 self.draw_line_but.highlight() | |
1121 | |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
1122 def sel_mode(self): |
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
1123 self.level_widget.sel_mode = not self.level_widget.sel_mode |
280 | 1124 if self.level_widget.sel_mode: |
1125 self.sel_mode_but.highlight() | |
1126 else: | |
1127 self.sel_mode_but.reset() | |
275
2abb61878bb1
Add a 'select object' with pop-up for easier editing
Neil Muller <drnlmuller@gmail.com>
parents:
262
diff
changeset
|
1128 |
109
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
1129 def mouse_move(self, ev): |
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
1130 self.level_widget.mouse_move(ev) |
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
1131 |
407 | 1132 def move_point(self): |
1133 self.level_widget.set_move_mode() | |
1134 self.move_point_but.highlight() | |
1135 | |
199
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
1136 def draw(self, surface): |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
1137 # Update checkbox state |
223
4197350b9897
Always show objects in objects mode
Neil Muller <drnlmuller@gmail.com>
parents:
220
diff
changeset
|
1138 if self._menu_mode == 'drawing': |
4197350b9897
Always show objects in objects mode
Neil Muller <drnlmuller@gmail.com>
parents:
220
diff
changeset
|
1139 self.level_widget.set_objects(self.show_objs.value) |
4197350b9897
Always show objects in objects mode
Neil Muller <drnlmuller@gmail.com>
parents:
220
diff
changeset
|
1140 self.level_widget.set_enemies(self.show_enemies.value) |
4197350b9897
Always show objects in objects mode
Neil Muller <drnlmuller@gmail.com>
parents:
220
diff
changeset
|
1141 else: |
4197350b9897
Always show objects in objects mode
Neil Muller <drnlmuller@gmail.com>
parents:
220
diff
changeset
|
1142 self.level_widget.set_objects(True) |
4197350b9897
Always show objects in objects mode
Neil Muller <drnlmuller@gmail.com>
parents:
220
diff
changeset
|
1143 self.level_widget.set_enemies(True) |
199
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
1144 super(EditorApp, self).draw(surface) |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
1145 |
51 | 1146 |
1147 if __name__ == "__main__": | |
195
b8701c0bb184
Reorder startup to avoid pygame init issues
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
1148 if len(sys.argv) not in [2, 4]: |
51 | 1149 print 'Please supply a levelname or levelname and level size' |
1150 sys.exit() | |
199
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
1151 # Need to ensure we have defaults for rendering |
c291fd4b49bf
Add showing objects to the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
198
diff
changeset
|
1152 parse_args([]) |
51 | 1153 pygame.display.init() |
1154 pygame.font.init() | |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
1155 pygame.display.set_mode((SCREEN[0] + MENU_WIDTH, SCREEN[1]), |
109
817d4a62135c
Partially albowify the level editor
Neil Muller <drnlmuller@gmail.com>
parents:
108
diff
changeset
|
1156 pgl.SWSURFACE) |
195
b8701c0bb184
Reorder startup to avoid pygame init issues
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
1157 if len(sys.argv) == 2: |
b8701c0bb184
Reorder startup to avoid pygame init issues
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
1158 level = EditorLevel(sys.argv[1]) |
b8701c0bb184
Reorder startup to avoid pygame init issues
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
1159 level.load(pymunk.Space()) |
b8701c0bb184
Reorder startup to avoid pygame init issues
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
1160 elif len(sys.argv) == 4: |
b8701c0bb184
Reorder startup to avoid pygame init issues
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
1161 level = EditorLevel(sys.argv[1], int(sys.argv[2]), int(sys.argv[3])) |
51 | 1162 pygame.display.set_caption('Nagslang Area Editor') |
108
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
1163 pygame.key.set_repeat(200, 100) |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
1164 app = EditorApp(level, pygame.display.get_surface()) |
dde91f8c4335
Add fonts needed for Albowifying the editor
Neil Muller <drnlmuller@gmail.com>
parents:
99
diff
changeset
|
1165 app.run() |