Mercurial > boomslang
annotate pyntnclick/tools/rect_drawer.py @ 686:48f68ae7d454 pyntnclick
Throw out more old stuff. Fix animation support
author | Neil Muller <neil@dip.sun.ac.za> |
---|---|
date | Mon, 13 Feb 2012 11:36:32 +0200 |
parents | 32e554adf538 |
children | 929b63589c96 |
rev | line source |
---|---|
165
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
1 # Quickly hacked together helper for working out |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
2 # interactive regions in Suspended Sentence |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
3 |
636
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
589
diff
changeset
|
4 frame_rect = None |
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
589
diff
changeset
|
5 Image = object |
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
589
diff
changeset
|
6 request_old_filename = None |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
7 |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
8 from pygame.locals import (K_LEFT, K_RIGHT, K_UP, K_DOWN, |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
9 K_a, K_t, K_d, K_i, K_r, K_o, K_b, K_z, |
648
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
10 BLEND_RGBA_MIN, SRCALPHA, QUIT) |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
11 import pygame |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
12 |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
13 import pyntnclick.constants |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
14 from pyntnclick.widgets.text import LabelWidget, TextButton |
648
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
15 from pyntnclick.widgets.base import Container |
174
a2d041e0ab83
Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents:
165
diff
changeset
|
16 |
a2d041e0ab83
Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents:
165
diff
changeset
|
17 |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
18 class RectDrawerConstants(pyntnclick.constants.GameConstants): |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
19 debug = True |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
20 menu_width = 200 |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
21 menu_button_height = 25 |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
22 zoom = 4 |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
23 zoom_step = 100 |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
24 |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
25 constants = RectDrawerConstants() |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
26 |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
27 |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
28 class AppPalette(object): |
165
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
29 |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
30 sel_width = 5 |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
31 |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
32 colors = [ |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
33 'red', 'maroon1', 'palevioletred1', 'moccasin', 'orange', |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
34 'honeydew', 'yellow', 'gold', 'goldenrod', 'brown', |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
35 'blue', 'purple', 'darkorchid4', 'thistle', 'skyblue1', |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
36 'green', 'palegreen1', 'darkgreen', 'aquamarine', 'darkolivegreen', |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
37 ] |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
38 |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
39 def __init__(self, app_image): |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
40 self.image = app_image |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
41 #super(AppPalette, self).__init__((35, 35), 4, 5, margin=2) |
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
42 #self.selection = 0 |
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
43 #self.image.rect_color = pygame.color.Color(self.colors[self.selection]) |
165
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
44 |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
45 def num_items(self): |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
46 return len(self.colors) |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
47 |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
48 def draw_item(self, surface, item_no, rect): |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
49 d = -2 * self.sel_width |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
50 r = rect.inflate(d, d) |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
51 surface.fill(pygame.color.Color(self.colors[item_no]), r) |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
52 |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
53 def click_item(self, item_no, event): |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
54 self.selection = item_no |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
55 self.image.rect_color = pygame.color.Color(self.colors[item_no]) |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
56 |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
57 def item_is_selected(self, item_no): |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
58 return self.selection == item_no |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
59 |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
60 |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
61 class AppImage(Container): |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
62 |
181
f98bc17f5e67
Add attributes for drawing rects
Neil Muller <neil@dip.sun.ac.za>
parents:
179
diff
changeset
|
63 rect_thick = 3 |
f98bc17f5e67
Add attributes for drawing rects
Neil Muller <neil@dip.sun.ac.za>
parents:
179
diff
changeset
|
64 draw_thick = 1 |
f98bc17f5e67
Add attributes for drawing rects
Neil Muller <neil@dip.sun.ac.za>
parents:
179
diff
changeset
|
65 |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
66 def __init__(self, gd, state): |
174
a2d041e0ab83
Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents:
165
diff
changeset
|
67 self.state = state |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
68 super(AppImage, self).__init__(pygame.rect.Rect(0, 0, |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
69 constants.screen[0], constants.screen[1]), gd) |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
70 self.mode = 'draw' |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
71 self.rects = [] |
200 | 72 self.images = [] |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
73 self.start_pos = None |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
74 self.end_pos = None |
165
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
75 self.rect_color = pygame.color.Color('white') |
200 | 76 self.current_image = None |
199 | 77 self.place_image_menu = None |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
78 self.close_button = LabelWidget(pygame.Rect((0, 0), (200, 100)), |
671
b27b5c6c54e8
Use constants for font location
Stefano Rivera <stefano@rivera.za.net>
parents:
664
diff
changeset
|
79 gd, 'Close', fontname=constants.bold_font, fontsize=20) |
243
0ea4661d134c
Show close button area in helper
Neil Muller <neil@dip.sun.ac.za>
parents:
238
diff
changeset
|
80 self.close_button.fg_color = (0, 0, 0) |
0ea4661d134c
Show close button area in helper
Neil Muller <neil@dip.sun.ac.za>
parents:
238
diff
changeset
|
81 self.close_button.bg_color = (0, 0, 0) |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
82 self.draw_rects = True |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
83 self.draw_things = True |
312
a0d66c0f5a89
Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents:
286
diff
changeset
|
84 self.draw_thing_rects = True |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
85 self.draw_images = True |
504
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
86 self.trans_images = False |
275
d78ce15bccc8
Crew quarters background and toolbar on the rect tool.
Jeremy Thurgood <firxen@gmail.com>
parents:
268
diff
changeset
|
87 self.draw_toolbar = True |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
88 self.old_mouse_pos = None |
506 | 89 self.zoom_display = False |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
90 self.draw_anim = False |
507
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
91 self.zoom_offset = (600, 600) |
524
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
92 if self.state.current_detail: |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
93 w, h = self.state.current_detail.get_detail_size() |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
94 rect = pygame.rect.Rect(0, 0, w, h) |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
95 self.close_button.rect.midbottom = rect.midbottom |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
96 self.offset = (0, 0) |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
97 else: |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
98 self.offset = (-self.state.current_scene.OFFSET[0], |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
99 -self.state.current_scene.OFFSET[1]) |
323
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
100 self.find_existing_intersects() |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
101 |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
102 def _get_scene(self): |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
103 if self.state.current_detail: |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
104 return self.state.current_detail |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
105 else: |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
106 return self.state.current_scene |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
107 |
323
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
108 def find_existing_intersects(self): |
320
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
109 """Parse the things in the scene for overlaps""" |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
110 scene = self._get_scene() |
323
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
111 # Pylint hates this function |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
112 for thing in scene.things.itervalues(): |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
113 for interact_name in thing.interacts: |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
114 thing.set_interact(interact_name) |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
115 if hasattr(thing.rect, 'collidepoint'): |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
116 thing_rects = [thing.rect] |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
117 else: |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
118 thing_rects = thing.rect |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
119 for thing2 in scene.things.itervalues(): |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
120 if thing is thing2: |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
121 continue |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
122 for interact2_name in thing2.interacts: |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
123 thing2.set_interact(interact2_name) |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
124 if hasattr(thing2.rect, 'collidepoint'): |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
125 thing2_rects = [thing2.rect] |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
126 else: |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
127 thing2_rects = thing2.rect |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
128 for my_rect in thing_rects: |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
129 for other_rect in thing2_rects: |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
130 if my_rect.colliderect(other_rect): |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
131 print 'Existing Intersecting rects' |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
132 print (" Thing1 %s Interact %s" |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
133 % (thing.name, interact_name)) |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
134 print (" Thing2 %s Interact %s" |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
135 % (thing2.name, interact2_name)) |
323
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
136 print " Rects", my_rect, other_rect |
0630a37cb371
Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents:
321
diff
changeset
|
137 print |
320
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
138 |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
139 def find_intersecting_rects(self, d): |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
140 """Find if any rect collections intersect""" |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
141 # I loath N^X brute search algorithm's, but whatever, hey |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
142 scene = self._get_scene() |
320
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
143 for (num, col) in enumerate(d): |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
144 rect_list = d[col] |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
145 for thing in scene.things.itervalues(): |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
146 for interact_name in thing.interacts: |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
147 thing.set_interact(interact_name) |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
148 if hasattr(thing.rect, 'collidepoint'): |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
149 thing_rects = [thing.rect] |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
150 else: |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
151 thing_rects = thing.rect |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
152 for other_rect in thing_rects: |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
153 for my_rect in rect_list: |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
154 if my_rect.colliderect(other_rect): |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
155 print 'Intersecting rects' |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
156 print " Object %s" % num |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
157 print (" Thing %s Interact %s" |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
158 % (thing.name, interact_name)) |
320
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
159 print " Rects", my_rect, other_rect |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
160 if thing.INITIAL: |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
161 thing.set_interact(thing.INITIAL) |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
162 print |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
163 for (num2, col2) in enumerate(d): |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
164 if num2 == num: |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
165 continue |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
166 other_list = d[col2] |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
167 for my_rect in rect_list: |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
168 for other_rect in other_list: |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
169 if my_rect.colliderect(other_rect): |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
170 print 'Intersecting rects', |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
171 print ' Object %s and %s' % (num, num2) |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
172 print " Rects", my_rect, other_rect |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
173 print |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
174 print |
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
175 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
176 def toggle_things(self, ev, widget): |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
177 self.draw_things = not self.draw_things |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
178 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
179 def toggle_thing_rects(self, ev, widget): |
312
a0d66c0f5a89
Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents:
286
diff
changeset
|
180 self.draw_thing_rects = not self.draw_thing_rects |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
181 scene = self._get_scene() |
312
a0d66c0f5a89
Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents:
286
diff
changeset
|
182 for thing in scene.things.itervalues(): |
a0d66c0f5a89
Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents:
286
diff
changeset
|
183 if not self.draw_thing_rects: |
a0d66c0f5a89
Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents:
286
diff
changeset
|
184 if not hasattr(thing, 'old_colour'): |
a0d66c0f5a89
Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents:
286
diff
changeset
|
185 thing.old_colour = thing._interact_hilight_color |
a0d66c0f5a89
Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents:
286
diff
changeset
|
186 thing._interact_hilight_color = None |
a0d66c0f5a89
Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents:
286
diff
changeset
|
187 else: |
a0d66c0f5a89
Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents:
286
diff
changeset
|
188 thing._interact_hilight_color = thing.old_colour |
a0d66c0f5a89
Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents:
286
diff
changeset
|
189 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
190 def toggle_images(self, ev, widget): |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
191 self.draw_images = not self.draw_images |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
192 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
193 def toggle_trans_images(self, ev, widget): |
504
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
194 self.trans_images = not self.trans_images |
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
195 self.invalidate() |
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
196 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
197 def toggle_rects(self, ev, widget): |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
198 self.draw_rects = not self.draw_rects |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
199 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
200 def toggle_toolbar(self, ev, widget): |
275
d78ce15bccc8
Crew quarters background and toolbar on the rect tool.
Jeremy Thurgood <firxen@gmail.com>
parents:
268
diff
changeset
|
201 self.draw_toolbar = not self.draw_toolbar |
d78ce15bccc8
Crew quarters background and toolbar on the rect tool.
Jeremy Thurgood <firxen@gmail.com>
parents:
268
diff
changeset
|
202 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
203 def toggle_zoom(self, ev, widget): |
506 | 204 self.zoom_display = not self.zoom_display |
205 | |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
206 def toggle_anim(self, ev, widget): |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
207 self.draw_anim = not self.draw_anim |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
208 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
209 def draw_mode(self, ev, widget): |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
210 self.mode = 'draw' |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
211 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
212 def del_mode(self, ev, widget): |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
213 self.mode = 'del' |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
214 self.start_pos = None |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
215 self.end_pos = None |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
216 |
503
65e17aba12c5
Tweak various aspects of image drawing/mouse code to handle edge cases better
Neil Muller <neil@dip.sun.ac.za>
parents:
502
diff
changeset
|
217 def draw_sub_image(self, image, surface, cropped_rect): |
65e17aba12c5
Tweak various aspects of image drawing/mouse code to handle edge cases better
Neil Muller <neil@dip.sun.ac.za>
parents:
502
diff
changeset
|
218 """Tweaked image drawing to avoid albow's centring the image in the |
65e17aba12c5
Tweak various aspects of image drawing/mouse code to handle edge cases better
Neil Muller <neil@dip.sun.ac.za>
parents:
502
diff
changeset
|
219 subsurface""" |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
220 surf = pygame.surface.Surface((cropped_rect.w, cropped_rect.h), |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
221 SRCALPHA).convert_alpha() |
503
65e17aba12c5
Tweak various aspects of image drawing/mouse code to handle edge cases better
Neil Muller <neil@dip.sun.ac.za>
parents:
502
diff
changeset
|
222 frame = surf.get_rect() |
504
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
223 imsurf = image.get_image().convert_alpha() |
503
65e17aba12c5
Tweak various aspects of image drawing/mouse code to handle edge cases better
Neil Muller <neil@dip.sun.ac.za>
parents:
502
diff
changeset
|
224 r = imsurf.get_rect() |
65e17aba12c5
Tweak various aspects of image drawing/mouse code to handle edge cases better
Neil Muller <neil@dip.sun.ac.za>
parents:
502
diff
changeset
|
225 r.topleft = frame.topleft |
504
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
226 if self.trans_images: |
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
227 surf.fill(pygame.color.Color(255, 255, 255, 96)) |
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
228 surf.blit(imsurf, r, None, BLEND_RGBA_MIN) |
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
229 else: |
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
230 surf.blit(imsurf, r, None) |
f3dbe35b6e4b
Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents:
503
diff
changeset
|
231 surface.blit(surf, cropped_rect) |
503
65e17aba12c5
Tweak various aspects of image drawing/mouse code to handle edge cases better
Neil Muller <neil@dip.sun.ac.za>
parents:
502
diff
changeset
|
232 |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
233 def draw(self, surface): |
506 | 234 if self.zoom_display: |
235 base_surface = surface.copy() | |
236 self.do_unzoomed_draw(base_surface) | |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
237 zoomed = pygame.transform.scale(base_surface, |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
238 (constants.zoom * constants.screen[0], |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
239 constants.zoom * constants.screen[1])) |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
240 area = pygame.rect.Rect(self.zoom_offset[0], self.zoom_offset[1], |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
241 self.zoom_offset[0] + constants.screen[0], |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
242 self.zoom_offset[1] + constants.screen[1]) |
507
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
243 surface.blit(zoomed, (0, 0), area) |
506 | 244 else: |
245 self.do_unzoomed_draw(surface) | |
246 | |
247 def do_unzoomed_draw(self, surface): | |
238
2510e0b0e901
Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents:
213
diff
changeset
|
248 if self.state.current_detail: |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
249 if self.draw_things: |
685 | 250 self.state.current_detail.draw(surface) |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
251 else: |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
252 self.state.current_detail.draw_background(surface) |
524
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
253 # We duplicate Albow's draw logic here, so we zoom the close |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
254 # button correctly |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
255 r = self.close_button.get_rect() |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
256 surf_rect = surface.get_rect() |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
257 sub_rect = surf_rect.clip(r) |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
258 try: |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
259 sub = surface.subsurface(sub_rect) |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
260 self.close_button.draw_all(sub) |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
261 except ValueError, e: |
a91cb4bffd5d
Make close button helper in rect_drawer zoom correctly
Neil Muller <neil@dip.sun.ac.za>
parents:
523
diff
changeset
|
262 print 'Error, failed to draw close button', e |
238
2510e0b0e901
Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents:
213
diff
changeset
|
263 else: |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
264 if self.draw_things: |
685 | 265 self.state.current_scene.draw(surface) |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
266 else: |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
267 self.state.current_scene.draw_background(surface) |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
268 if self.mode == 'draw' and self.start_pos and self.draw_rects: |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
269 rect = pygame.rect.Rect(self.start_pos[0], self.start_pos[1], |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
270 self.end_pos[0] - self.start_pos[0], |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
271 self.end_pos[1] - self.start_pos[1]) |
321 | 272 rect.normalize() |
320
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
273 frame_rect(surface, self.rect_color, rect, self.draw_thick) |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
274 if self.draw_rects: |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
275 for (col, rect) in self.rects: |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
276 frame_rect(surface, col, rect, self.rect_thick) |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
277 if self.draw_images: |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
278 for image in self.images: |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
279 if image.rect.colliderect(surface.get_rect()): |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
280 cropped_rect = image.rect.clip(surface.get_rect()) |
503
65e17aba12c5
Tweak various aspects of image drawing/mouse code to handle edge cases better
Neil Muller <neil@dip.sun.ac.za>
parents:
502
diff
changeset
|
281 self.draw_sub_image(image, surface, cropped_rect) |
268
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
282 else: |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
283 print 'image outside surface', image |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
284 if self.current_image and self.mode == 'image': |
e4ea9def56b2
Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents:
250
diff
changeset
|
285 if self.current_image.rect.colliderect(surface.get_rect()): |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
286 cropped_rect = self.current_image.rect.clip( |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
287 surface.get_rect()) |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
288 self.draw_sub_image(self.current_image, surface, |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
289 cropped_rect) |
275
d78ce15bccc8
Crew quarters background and toolbar on the rect tool.
Jeremy Thurgood <firxen@gmail.com>
parents:
268
diff
changeset
|
290 if self.draw_toolbar: |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
291 tb_surf = surface.subsurface(0, constants.screen[1] |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
292 - constants.button_size, |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
293 constants.screen[0], |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
294 constants.button_size).convert_alpha() |
276
75f4ee46ac58
Better (and fixed) rect tool with toolbar overlay.
Jeremy Thurgood <firxen@gmail.com>
parents:
275
diff
changeset
|
295 tb_surf.fill(pygame.color.Color(127, 0, 0, 191)) |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
296 surface.blit(tb_surf, (0, constants.screen[1] |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
297 - constants.button_size)) |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
298 |
165
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
299 def _make_dict(self): |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
300 d = {} |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
301 for col, rect in self.rects: |
213
20998c650ce1
Fixed rect_drawer tool and adjusted JIM message background.
Jeremy Thurgood <firxen@gmail.com>
parents:
200
diff
changeset
|
302 col = (col.r, col.g, col.b) |
165
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
303 d.setdefault(col, []) |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
304 d[col].append(rect) |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
305 return d |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
306 |
198
e73d78d6dd83
Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents:
197
diff
changeset
|
307 def print_objs(self): |
165
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
308 d = self._make_dict() |
320
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
309 self.find_intersecting_rects(d) |
165
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
310 for (num, col) in enumerate(d): |
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
311 print 'Rect %d : ' % num |
279
c67a4a4d78f6
Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents:
276
diff
changeset
|
312 for rect in d[col]: |
c67a4a4d78f6
Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents:
276
diff
changeset
|
313 r = rect.move(self.offset) |
179
39f75faf16cb
Add trailing , for copy-n-paste
Neil Muller <neil@dip.sun.ac.za>
parents:
174
diff
changeset
|
314 print ' (%d, %d, %d, %d),' % (r.x, r.y, r.w, r.h) |
165
9b3bba5e65f3
add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents:
162
diff
changeset
|
315 print |
200 | 316 for i, image in enumerate(self.images): |
317 print 'Image %d' % i | |
279
c67a4a4d78f6
Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents:
276
diff
changeset
|
318 rect = image.rect |
c67a4a4d78f6
Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents:
276
diff
changeset
|
319 r = rect.move(self.offset) |
200 | 320 print ' (%d, %d, %d, %d),' % (r.x, r.y, r.w, r.h) |
321 print | |
320
c295b06b27f8
Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents:
312
diff
changeset
|
322 print |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
323 |
199 | 324 def image_load(self): |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
325 image_path = ('%s/Resources/images/%s' |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
326 % (script_path, self.state.current_scene.FOLDER)) |
199 | 327 imagename = request_old_filename(directory=image_path) |
328 try: | |
200 | 329 image_data = pygame.image.load(imagename) |
330 self.current_image = Image(image_data) | |
199 | 331 self.place_image_menu.enabled = True |
200 | 332 # ensure we're off screen to start |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
333 self.current_image.rect = image_data.get_rect() \ |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
334 .move(constants.screen[0] + constants.menu_width, |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
335 constants.screen[1]) |
199 | 336 except pygame.error, e: |
337 print 'Unable to load image %s' % e | |
198
e73d78d6dd83
Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents:
197
diff
changeset
|
338 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
339 def image_mode(self, ev, widget): |
198
e73d78d6dd83
Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents:
197
diff
changeset
|
340 self.mode = 'image' |
e73d78d6dd83
Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents:
197
diff
changeset
|
341 self.start_pos = None |
e73d78d6dd83
Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents:
197
diff
changeset
|
342 self.end_pos = None |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
343 # So we do the right thing for off screen images |
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
344 self.old_mouse_pos = None |
198
e73d78d6dd83
Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents:
197
diff
changeset
|
345 |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
346 def cycle_mode(self, ev, widget): |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
347 self.mode = 'cycle' |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
348 |
506 | 349 def _conv_pos(self, mouse_pos): |
350 if self.zoom_display: | |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
351 pos = ((mouse_pos[0] + self.zoom_offset[0]) / constants.zoom, |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
352 (mouse_pos[1] + self.zoom_offset[1]) / constants.zoom) |
506 | 353 else: |
354 pos = mouse_pos | |
355 return pos | |
356 | |
507
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
357 def _check_limits(self, offset): |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
358 if offset[0] < 0: |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
359 offset[0] = 0 |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
360 if offset[1] < 0: |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
361 offset[1] = 0 |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
362 width, height = constants.screen |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
363 if offset[0] > constants.zoom * width - width: |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
364 offset[0] = constants.zoom * width - width |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
365 if offset[1] > constants.zoom * height - height: |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
366 offset[1] = constants.zoom * height - height |
507
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
367 |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
368 def _make_zoom_offset(self, pos): |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
369 zoom_pos = (pos[0] * constants.zoom, pos[1] * constants.zoom) |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
370 offset = [zoom_pos[0] - constants.screen[0] / 2, |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
371 zoom_pos[1] - constants.screen[1] / 2] |
507
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
372 self._check_limits(offset) |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
373 self.zoom_offset = tuple(offset) |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
374 |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
375 def _move_zoom(self, x, y): |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
376 offset = list(self.zoom_offset) |
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
377 offset[0] += constants.zoom_step * x |
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
550
diff
changeset
|
378 offset[1] += constants.zoom_step * y |
507
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
379 self._check_limits(offset) |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
380 self.zoom_offset = tuple(offset) |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
381 |
503
65e17aba12c5
Tweak various aspects of image drawing/mouse code to handle edge cases better
Neil Muller <neil@dip.sun.ac.za>
parents:
502
diff
changeset
|
382 def do_mouse_move(self, e): |
506 | 383 pos = self._conv_pos(e.pos) |
507
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
384 if not self.zoom_display: |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
385 # Construct zoom offset from mouse pos |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
386 self._make_zoom_offset(e.pos) |
200 | 387 if self.mode == 'image' and self.current_image: |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
388 if self.old_mouse_pos: |
537
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
389 delta = (pos[0] - self.old_mouse_pos[0], |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
390 pos[1] - self.old_mouse_pos[1]) |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
391 self.current_image.rect.center = ( |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
392 self.current_image.rect.center[0] + delta[0], |
5b9f371c2bb8
PEP-8 cleanup of tools
Stefano Rivera <stefano@rivera.za.net>
parents:
524
diff
changeset
|
393 self.current_image.rect.center[1] + delta[1]) |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
394 else: |
506 | 395 self.current_image.rect.center = pos |
200 | 396 self.invalidate() |
506 | 397 self.old_mouse_pos = pos |
200 | 398 |
482
2bef605a0ef2
Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents:
323
diff
changeset
|
399 def key_down(self, e): |
2bef605a0ef2
Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents:
323
diff
changeset
|
400 if self.mode == 'image' and self.current_image: |
2bef605a0ef2
Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents:
323
diff
changeset
|
401 # Move the image by 1 pixel |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
402 cur_pos = self.current_image.rect.center |
482
2bef605a0ef2
Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents:
323
diff
changeset
|
403 if e.key == K_LEFT: |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
404 self.current_image.rect.center = (cur_pos[0] - 1, cur_pos[1]) |
482
2bef605a0ef2
Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents:
323
diff
changeset
|
405 elif e.key == K_RIGHT: |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
406 self.current_image.rect.center = (cur_pos[0] + 1, cur_pos[1]) |
482
2bef605a0ef2
Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents:
323
diff
changeset
|
407 elif e.key == K_UP: |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
408 self.current_image.rect.center = (cur_pos[0], cur_pos[1] - 1) |
482
2bef605a0ef2
Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents:
323
diff
changeset
|
409 elif e.key == K_DOWN: |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
410 self.current_image.rect.center = (cur_pos[0], cur_pos[1] + 1) |
507
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
411 elif self.zoom_display: |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
412 if e.key == K_LEFT: |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
413 self._move_zoom(-1, 0) |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
414 elif e.key == K_RIGHT: |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
415 self._move_zoom(1, 0) |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
416 elif e.key == K_UP: |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
417 self._move_zoom(0, -1) |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
418 elif e.key == K_DOWN: |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
419 self._move_zoom(0, 1) |
caec319a4ae3
Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents:
506
diff
changeset
|
420 |
505
4c8aa01b606c
Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents:
504
diff
changeset
|
421 if e.key == K_o: |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
422 self.toggle_trans_images(None, None) |
505
4c8aa01b606c
Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents:
504
diff
changeset
|
423 elif e.key == K_t: |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
424 self.toggle_things(None, None) |
505
4c8aa01b606c
Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents:
504
diff
changeset
|
425 elif e.key == K_r: |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
426 self.toggle_thing_rects(None, None) |
505
4c8aa01b606c
Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents:
504
diff
changeset
|
427 elif e.key == K_i: |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
428 self.toggle_images(None, None) |
505
4c8aa01b606c
Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents:
504
diff
changeset
|
429 elif e.key == K_d: |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
430 self.toggle_rects(None, None) |
505
4c8aa01b606c
Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents:
504
diff
changeset
|
431 elif e.key == K_b: |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
432 self.toggle_toolbar(None, None) |
506 | 433 elif e.key == K_z: |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
434 self.toggle_zoom(None, None) |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
435 elif e.key == K_a: |
664
d1c1253fcd77
Now with somewhat fewer crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
663
diff
changeset
|
436 self.toggle_anim(None, None) |
482
2bef605a0ef2
Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents:
323
diff
changeset
|
437 |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
438 def mouse_down(self, e): |
506 | 439 pos = self._conv_pos(e.pos) |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
440 if self.mode == 'del': |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
441 cand = None |
200 | 442 # Images are drawn above rectangles, so search those first |
443 for image in self.images: | |
444 if image.rect.collidepoint(pos): | |
445 cand = image | |
446 break | |
447 if cand: | |
448 self.images.remove(cand) | |
449 self.invalidate() | |
450 return | |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
451 for (col, rect) in self.rects: |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
452 if rect.collidepoint(pos): |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
453 cand = (col, rect) |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
454 break |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
455 if cand: |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
456 self.rects.remove(cand) |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
457 self.invalidate() |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
458 elif self.mode == 'cycle': |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
459 scene = self._get_scene() |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
460 cand = None |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
461 for thing in scene.things.itervalues(): |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
462 if thing.contains(pos): |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
463 cand = thing |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
464 break |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
465 if cand: |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
466 # Find current interacts in this thing |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
467 cur_interact = cand.current_interact |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
468 j = cand.interacts.values().index(cur_interact) |
538 | 469 if j + 1 < len(cand.interacts): |
470 next_name = cand.interacts.keys()[j + 1] | |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
471 else: |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
472 next_name = cand.interacts.keys()[0] |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
473 if cand.interacts[next_name] != cur_interact: |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
474 cand.set_interact(next_name) |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
475 elif self.mode == 'draw': |
506 | 476 self.start_pos = pos |
477 self.end_pos = pos | |
200 | 478 elif self.mode == 'image': |
479 if self.current_image: | |
480 self.images.append(self.current_image) | |
481 self.current_image = None | |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
482 self.old_mouse_pos = None |
200 | 483 self.invalidate() |
484 else: | |
485 cand = None | |
486 for image in self.images: | |
487 if image.rect.collidepoint(e.pos): | |
488 cand = image | |
489 break | |
490 if cand: | |
491 self.images.remove(cand) | |
492 self.current_image = cand | |
502
f53aaba58273
Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents:
482
diff
changeset
|
493 # We want to move relative to the current mouse pos, so |
506 | 494 self.old_mouse_pos = pos |
200 | 495 self.invalidate() |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
496 |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
497 def mouse_up(self, e): |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
498 if self.mode == 'draw': |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
499 rect = pygame.rect.Rect(self.start_pos[0], self.start_pos[1], |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
500 self.end_pos[0] - self.start_pos[0], |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
501 self.end_pos[1] - self.start_pos[1]) |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
502 rect.normalize() |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
503 self.rects.append((self.rect_color, rect)) |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
504 self.start_pos = self.end_pos = None |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
505 |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
506 def mouse_drag(self, e): |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
507 if self.mode == 'draw': |
506 | 508 self.end_pos = self._conv_pos(e.pos) |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
509 self.invalidate() |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
510 |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
511 def animate(self): |
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
512 if self.draw_anim: |
686
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
513 self.state.animate() |
510
d274cc414178
Add show animate & cycle interact options
Neil Muller <neil@dip.sun.ac.za>
parents:
509
diff
changeset
|
514 |
509 | 515 |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
516 class ModeLabel(LabelWidget): |
509 | 517 |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
518 def __init__(self, rect, gd, app_image): |
509 | 519 self.app_image = app_image |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
520 super(ModeLabel, self).__init__(rect, |
671
b27b5c6c54e8
Use constants for font location
Stefano Rivera <stefano@rivera.za.net>
parents:
664
diff
changeset
|
521 gd, 'Mode : ', fontname=constants.bold_font, |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
522 fontsize=15, color=pygame.color.Color(128, 0, 255)) |
509 | 523 |
524 def draw_all(self, surface): | |
525 self.set_text('Mode : %s' % self.app_image.mode) | |
526 super(ModeLabel, self).draw_all(surface) | |
527 | |
528 | |
663
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
529 def make_button(text, gd, action, ypos): |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
530 rect = pygame.rect.Rect(0, 0, constants.menu_width, |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
531 constants.menu_button_height) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
532 rect.move_ip(805, ypos) |
671
b27b5c6c54e8
Use constants for font location
Stefano Rivera <stefano@rivera.za.net>
parents:
664
diff
changeset
|
533 button = TextButton(rect, gd, text, fontname=constants.font, fontsize=12, |
663
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
534 color=pygame.color.Color(255, 255, 0), border=1, padding=3) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
535 button.add_callback('clicked', action) |
197 | 536 return button |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
537 |
509 | 538 |
648
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
539 class RectApp(Container): |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
540 """The actual rect drawer main app""" |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
541 def __init__(self, rect, gd): |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
542 super(RectApp, self).__init__(rect, gd) |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
543 |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
544 state = gd.initial_state() |
686
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
545 gd.sound.disable_sound() # No sound here |
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
546 |
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
547 # Handle any setup that needs to happen |
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
548 # We start in leave, so do this twice |
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
549 # FIXME: Screen parameter to check_enter_leave |
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
550 # should go away |
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
551 state.check_enter_leave(None) |
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
552 state.check_enter_leave(None) |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
553 |
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
554 self.image = AppImage(gd, state) |
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
555 self.add(self.image) |
663
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
556 mode_label = ModeLabel(pygame.Rect((805, 0), (200, 25)), |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
557 self.gd, self.image) |
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
558 self.add(mode_label) |
663
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
559 y = mode_label.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
560 draw = make_button('Draw Rect', gd, self.image.draw_mode, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
561 self.add(draw) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
562 y += draw.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
563 load_image = make_button("Load image", gd, self.image.image_load, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
564 self.add(load_image) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
565 y += load_image.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
566 add_image = make_button("Place/Move images", gd, |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
567 self.image.image_mode, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
568 add_image.enabled = False |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
569 self.add(add_image) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
570 self.image.place_image_menu = add_image |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
571 y += add_image.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
572 cycle = make_button("Cycle interacts", gd, self.image.cycle_mode, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
573 self.add(cycle) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
574 y += cycle.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
575 delete = make_button("Delete Objects", gd, self.image.del_mode, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
576 self.add(delete) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
577 y += delete.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
578 #palette = AppPalette(self.image) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
579 #palette.rect.move_ip(810, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
580 #self.add(palette) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
581 #y += palette.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
582 print_rects = make_button("Print objects", gd, |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
583 self.image.print_objs, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
584 self.add(print_rects) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
585 y += print_rects.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
586 toggle_things = make_button("Show Things (t)", gd, |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
587 self.image.toggle_things, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
588 self.add(toggle_things) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
589 y += toggle_things.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
590 toggle_thing_rects = make_button("Show Thing Rects (r)", gd, |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
591 self.image.toggle_thing_rects, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
592 self.add(toggle_thing_rects) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
593 y += toggle_thing_rects.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
594 toggle_images = make_button("Show Images (i)", gd, |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
595 self.image.toggle_images, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
596 self.add(toggle_images) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
597 y += toggle_images.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
598 trans_images = make_button("Opaque Images (o)", gd, |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
599 self.image.toggle_trans_images, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
600 self.add(trans_images) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
601 y += trans_images.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
602 toggle_rects = make_button("Show Drawn Rects (d)", gd, |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
603 self.image.toggle_rects, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
604 self.add(toggle_rects) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
605 y += toggle_rects.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
606 toggle_toolbar = make_button("Show Toolbar (b)", gd, |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
607 self.image.toggle_toolbar, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
608 self.add(toggle_toolbar) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
609 y += toggle_toolbar.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
610 toggle_anim = make_button("Show Animations (a)", gd, |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
611 self.image.toggle_anim, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
612 self.add(toggle_anim) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
613 y += toggle_anim.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
614 toggle_zoom = make_button("Zoom (z)", gd, self.image.toggle_zoom, y) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
615 self.add(toggle_zoom) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
616 y += toggle_zoom.rect.height |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
617 quit_but = make_button("Quit", gd, self.quit, 570) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
618 self.add(quit_but) |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
619 |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
620 def quit(self, ev, widget): |
b67fdd4a152d
Readd buttons to rect_drawer - now with extra crashy bits
Neil Muller <neil@dip.sun.ac.za>
parents:
662
diff
changeset
|
621 pygame.event.post(pygame.event.Event(QUIT)) |
662
6daaeffb37d1
The rect drawer becomes less black
Neil Muller <neil@dip.sun.ac.za>
parents:
661
diff
changeset
|
622 |
686
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
623 def animate(self): |
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
624 self.image.animate() |
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
625 |
648
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
626 |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
627 class RectEngine(object): |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
628 """Engine for the rect drawer.""" |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
629 |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
630 def __init__(self, gd, get_initial_state, scene, detail): |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
631 self.state = None |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
632 self._gd = gd |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
633 rect = pygame.display.get_surface().get_rect() |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
634 self.app = RectApp(rect, self._gd) |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
635 |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
636 def run(self): |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
637 """App loop""" |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
638 clock = pygame.time.Clock() |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
639 while True: |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
640 events = pygame.event.get() |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
641 for ev in events: |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
642 if ev.type == QUIT: |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
643 return |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
644 else: |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
645 self.app.event(ev) |
686
48f68ae7d454
Throw out more old stuff. Fix animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
685
diff
changeset
|
646 self.app.animate() |
648
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
647 surface = pygame.display.get_surface() |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
648 self.app.draw(surface) |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
649 pygame.display.flip() |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
650 clock.tick(self._gd.constants.frame_rate) |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
651 |
b2c2b6f56291
baby steps to fixing rect_drawer - it has now progressed to being completely useless
Neil Muller <neil@dip.sun.ac.za>
parents:
636
diff
changeset
|
652 |
589
ebc48b397fd5
Turn rect_drawer into a command line option
Neil Muller <neil@dip.sun.ac.za>
parents:
576
diff
changeset
|
653 def make_rect_display(): |
162
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
654 pygame.display.init() |
225e3a4b1e85
Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff
changeset
|
655 pygame.font.init() |
661
5dc866e1d71d
Misc pep8 and pyflakes fixes
Neil Muller <neil@dip.sun.ac.za>
parents:
648
diff
changeset
|
656 pygame.display.set_mode((constants.screen[0] |
5dc866e1d71d
Misc pep8 and pyflakes fixes
Neil Muller <neil@dip.sun.ac.za>
parents:
648
diff
changeset
|
657 + constants.menu_width, constants.screen[1])) |