Mercurial > skaapsteker
annotate skaapsteker/physics.py @ 416:3db2fc263d11
Kill sprites that leave the level area.
| author | Simon Cross <hodgestar@gmail.com> |
|---|---|
| date | Sat, 09 Apr 2011 17:42:20 +0200 |
| parents | 55e00f186c6f |
| children | 7c0643e51f33 |
| rev | line source |
|---|---|
|
22
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
1 """Model of gravity, acceleration, velocities and collisions. |
|
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
2 |
|
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
3 Works very closely with sprites/base.py. |
|
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
4 """ |
|
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
5 |
|
105
c455b7925212
Global options in skaapsteker.__init__
Stefano Rivera <stefano@rivera.za.net>
parents:
104
diff
changeset
|
6 import time |
|
c455b7925212
Global options in skaapsteker.__init__
Stefano Rivera <stefano@rivera.za.net>
parents:
104
diff
changeset
|
7 |
| 39 | 8 import pygame |
|
105
c455b7925212
Global options in skaapsteker.__init__
Stefano Rivera <stefano@rivera.za.net>
parents:
104
diff
changeset
|
9 import pygame.draw |
|
c455b7925212
Global options in skaapsteker.__init__
Stefano Rivera <stefano@rivera.za.net>
parents:
104
diff
changeset
|
10 import pygame.sprite |
|
155
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
11 from pygame.mask import from_surface |
|
105
c455b7925212
Global options in skaapsteker.__init__
Stefano Rivera <stefano@rivera.za.net>
parents:
104
diff
changeset
|
12 |
|
c455b7925212
Global options in skaapsteker.__init__
Stefano Rivera <stefano@rivera.za.net>
parents:
104
diff
changeset
|
13 from . import options |
|
c455b7925212
Global options in skaapsteker.__init__
Stefano Rivera <stefano@rivera.za.net>
parents:
104
diff
changeset
|
14 from .constants import EPSILON |
|
22
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
15 |
|
128
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
16 class Sprite(pygame.sprite.Sprite): |
|
22
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
17 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
18 # physics attributes |
|
22
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
19 mobile = True # whether the velocity may be non-zero |
|
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
20 gravitates = True # whether gravity applies to the sprite |
|
267
3bee081ad4ac
Bump up horizontal terminal velocity so sprinting is interesting
Neil Muller <drnlmuller@gmail.com>
parents:
211
diff
changeset
|
21 terminal_velocity = (900.0, 500.0) # maximum horizontal and vertial speeds (pixels / s) |
| 112 | 22 bounce_factor = (0.95, 0.95) # bounce factor |
| 121 | 23 mass = 1.0 # used for shared collisions and applying forces |
|
128
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
24 friction_coeff = (0.99, 0.99) # friction factor |
| 39 | 25 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
26 # collision attributes |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
27 # Sprite X collides with Y iff (X.collision_layer in Y.collides_with) and X.check_collides(Y) |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
28 # Collisions result in the colliding movement being partially backed out, a call to X.bounce(frac) and a call to X.collided(Y) |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
29 # X.bounce(frac) is only called for the first (as determined by backing out distance) collision in a multi-collision event |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
30 collision_layer = None # never collides with anything |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
31 collides_with = set() # nothing collides with this |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
32 |
|
172
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
33 # set to True to have .update() called once per tick (and have .collision_group set) |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
34 wants_updates = False |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
35 |
|
117
b361d9e17c26
Angry fruit salad debug boxes.
Jeremy Thurgood <firxen@gmail.com>
parents:
116
diff
changeset
|
36 debug_color = (240, 0, 0) |
|
b361d9e17c26
Angry fruit salad debug boxes.
Jeremy Thurgood <firxen@gmail.com>
parents:
116
diff
changeset
|
37 |
| 146 | 38 floor = False # We special case collisions with ground objects |
|
155
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
39 block = False |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
40 |
| 39 | 41 def __init__(self, *args, **kwargs): |
| 42 super(Sprite, self).__init__(*args, **kwargs) | |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
43 self.on_solid = False |
| 39 | 44 self.velocity = (0.0, 0.0) |
| 45 self.rect = pygame.Rect(0, 0, 10, 10) # sub-classes should override | |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
121
diff
changeset
|
46 self.collide_rect = pygame.Rect(0, 0, 10, 10) # rectangle we use for collisions |
|
186
72e92893ccb8
Use layers for floor check
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
47 self.floor_rect = self.collide_rect |
| 43 | 48 self.image = pygame.Surface((10, 10)) |
| 49 self.image.fill((0, 0, 200)) | |
|
172
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
50 self.collision_group = None |
|
155
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
51 self._mask_cache = {} # image id -> collision bit mask |
| 66 | 52 |
| 53 def init_pos(self): | |
| 54 self._float_pos = self.rect.topleft | |
| 39 | 55 |
|
117
b361d9e17c26
Angry fruit salad debug boxes.
Jeremy Thurgood <firxen@gmail.com>
parents:
116
diff
changeset
|
56 def get_debug_color(self): |
|
b361d9e17c26
Angry fruit salad debug boxes.
Jeremy Thurgood <firxen@gmail.com>
parents:
116
diff
changeset
|
57 return self.debug_color |
|
b361d9e17c26
Angry fruit salad debug boxes.
Jeremy Thurgood <firxen@gmail.com>
parents:
116
diff
changeset
|
58 |
| 53 | 59 def draw_debug(self, surface): |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
121
diff
changeset
|
60 pygame.draw.rect(surface, self.get_debug_color(), self.collide_rect, 1) |
| 53 | 61 |
| 121 | 62 def deltaf(self, df): |
| 63 dv = df[0] / self.mass, df[1] / self.mass | |
| 64 self.deltav(dv) | |
| 65 | |
| 39 | 66 def deltav(self, dv): |
| 67 v_x, v_y = self.velocity | |
| 68 v_x, v_y = v_x + dv[0], v_y + dv[1] | |
| 69 | |
| 70 t_v = self.terminal_velocity | |
| 71 v_x = max(min(v_x, t_v[0]), -t_v[0]) | |
| 72 v_y = max(min(v_y, t_v[1]), -t_v[1]) | |
| 73 | |
| 74 self.velocity = (v_x, v_y) | |
| 75 | |
| 76 def deltap(self, dt): | |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
121
diff
changeset
|
77 old_pos = self.rect.topleft |
| 39 | 78 v_x, v_y = self.velocity |
| 66 | 79 f_x, f_y = self._float_pos |
| 39 | 80 d_x, d_y = v_x * dt, v_y * dt |
| 66 | 81 f_x, f_y = f_x + d_x, f_y + d_y |
| 82 self._float_pos = f_x, f_y | |
| 83 self.rect.topleft = int(f_x), int(f_y) | |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
121
diff
changeset
|
84 delta_pos = self.rect.left - old_pos[0], self.rect.top - old_pos[1] |
|
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
121
diff
changeset
|
85 self.collide_rect.move_ip(delta_pos) |
|
186
72e92893ccb8
Use layers for floor check
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
86 self.floor_rect.move_ip(delta_pos) |
| 66 | 87 |
|
155
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
88 def _check_mask(self): |
|
161
134ed5e026ae
Neatean _check_mask a bit.
Simon Cross <hodgestar@gmail.com>
parents:
159
diff
changeset
|
89 mask = self._mask_cache.get(id(self.image)) |
|
155
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
90 if mask is None: |
|
161
134ed5e026ae
Neatean _check_mask a bit.
Simon Cross <hodgestar@gmail.com>
parents:
159
diff
changeset
|
91 mask = self._mask_cache[id(self.image)] = from_surface(self.image) |
|
155
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
92 self.mask = mask |
|
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
93 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
94 def check_collides(self, other): |
|
155
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
95 # check bitmasks for collision |
|
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
96 self._check_mask() |
|
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
97 other._check_mask() |
|
b2e0f1246c38
Hook up bitmasked based collisions (mask caching may be unnecessary, please comment on whether this effects performance for you).
Simon Cross <hodgestar@gmail.com>
parents:
152
diff
changeset
|
98 return pygame.sprite.collide_mask(self, other) |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
99 |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
100 def collided(self, other): |
| 98 | 101 pass |
| 66 | 102 |
|
401
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
103 def check_floors(self, floors): |
|
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
104 """Trigger of the current set of floors""" |
|
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
105 pass |
|
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
106 |
|
128
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
107 def apply_friction(self): |
|
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
108 v_x, v_y = self.velocity |
|
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
109 self.velocity = self.friction_coeff[0] * v_x, self.friction_coeff[1] * v_y |
|
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
110 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
111 def bounce(self, other, normal): |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
112 """Alter velocity after a collision. |
|
78
f29b7ada68c1
Fix bouncing and tweak universal constants to show it off.
Simon Cross <hodgestar@gmail.com>
parents:
68
diff
changeset
|
113 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
114 other: sprite collided with |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
115 normal: unit vector (tuple) normal to the collision |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
116 surface. |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
117 """ |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
118 v_x, v_y = self.velocity |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
119 b_x = 1.0 + self.bounce_factor[0] * other.bounce_factor[0] |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
120 b_y = 1.0 + self.bounce_factor[1] * other.bounce_factor[1] |
| 121 | 121 dv_x = - normal[0] * b_x * v_x |
| 122 dv_y = - normal[1] * b_y * v_y | |
| 123 | |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
124 if normal == (0, 1) and (other.floor or other.block) and v_y > 0 and self.collide_rect.top < other.collide_rect.top: |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
125 # Colliding with the ground from above is special |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
126 self.on_solid = True |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
127 dv_y = -v_y |
|
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
128 |
| 121 | 129 if other.mobile: |
| 130 total_mass = self.mass + other.mass | |
| 131 f_self = self.mass / total_mass | |
| 132 f_other = other.mass / total_mass | |
| 133 | |
| 134 self.deltav((dv_x * f_self, dv_y * f_self)) | |
| 135 other.deltav((- dv_x * f_other, - dv_y * f_other)) | |
| 136 else: | |
| 137 self.deltav((dv_x, dv_y)) # oof | |
| 39 | 138 |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
139 def update(self): |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
140 pass # only called in wants_update = True |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
141 |
|
172
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
142 def check_collide_rect(self, new_collide_rect, new_rect, new_image): |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
143 if self.collision_group is None: |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
144 return True |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
145 |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
146 # TODO: decide whether to throw out checking of existing |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
147 # collisions. Doesn't seem needed at the moment and takes |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
148 # time. |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
149 old_image = self.image |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
150 old_rect = self.rect |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
151 #rect_collides = self.collide_rect.colliderect |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
152 old_collisions = set() |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
153 #for other in self.collision_group: |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
154 # if rect_collides(other.collide_rect) \ |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
155 # and self.check_collides(other): |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
156 # old_collisions.add(other) |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
157 |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
158 self.image = new_image |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
159 self.rect = new_rect |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
160 new_rect_collides = new_collide_rect.colliderect |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
161 new_collisions = set() |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
162 for other in self.collision_group: |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
163 if new_rect_collides(other.collide_rect) \ |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
164 and self.check_collides(other): |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
165 new_collisions.add(other) |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
166 |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
167 self.image = old_image |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
168 self.rect = old_rect |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
169 return not bool(new_collisions - old_collisions) |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
170 |
|
416
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
171 def fix_bounds(self): |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
172 print "Killing", self, self.rect, self._float_pos |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
173 self.kill() |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
174 |
|
22
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
175 |
|
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
176 class World(object): |
|
23
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
177 |
|
177
88a78fb9fa82
Tweak some constants to make player motion more comfortable.
Jeremy Thurgood <firxen@gmail.com>
parents:
172
diff
changeset
|
178 GRAVITY = 0.0, 9.8 * 80.0 # pixels / s^2 |
| 39 | 179 |
|
416
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
180 def __init__(self, bounds): |
|
57
e545236dd8f4
Change back to plain layered updater since everything is dirty all the time. Remove collision print since collisions appear to work.
Simon Cross <hodgestar@gmail.com>
parents:
53
diff
changeset
|
181 self._all = pygame.sprite.LayeredUpdates() |
|
23
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
182 self._mobiles = pygame.sprite.Group() |
|
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
183 self._gravitators = pygame.sprite.Group() |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
184 self._updaters = pygame.sprite.Group() |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
185 self._actionables = pygame.sprite.Group() |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
186 self._actors = pygame.sprite.Group() |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
187 self._collision_groups = { None: pygame.sprite.Group() } |
| 39 | 188 self._last_time = None |
|
416
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
189 self._bounds = bounds |
|
23
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
190 |
|
104
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
191 def freeze(self): |
|
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
192 self._last_time = None |
|
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
193 |
|
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
194 def thaw(self): |
|
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
195 self._last_time = time.time() |
|
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
196 |
|
23
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
197 def add(self, sprite): |
| 66 | 198 sprite.init_pos() |
|
23
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
199 self._all.add(sprite) |
|
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
200 if sprite.mobile: |
|
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
201 self._mobiles.add(sprite) |
|
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
202 if sprite.gravitates: |
|
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
203 self._gravitators.add(sprite) |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
204 if sprite.wants_updates: |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
205 self._updaters.add(sprite) |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
206 self._add_collision_group(sprite.collision_layer) |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
207 for layer in sprite.collides_with: |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
208 self._add_collision_group(layer) |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
209 self._collision_groups[layer].add(sprite) |
|
172
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
210 if sprite.wants_updates: |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
211 self._updaters.add(sprite) |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
161
diff
changeset
|
212 sprite.collision_group = self._collision_groups[sprite.collision_layer] |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
213 if getattr(sprite, 'player_action', None) is not None: |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
214 self._actionables.add(sprite) |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
215 if getattr(sprite, 'add_actionable', None) is not None: |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
216 self._actors.add(sprite) |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
217 |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
218 def _add_collision_group(self, layer): |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
219 if layer in self._collision_groups: |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
220 return |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
221 self._collision_groups[layer] = pygame.sprite.Group() |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
222 |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
223 def _backout_collisions(self, sprite, others, dt): |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
224 frac, normal, idx = 0.0, None, None |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
225 v_x, v_y = sprite.velocity |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
226 abs_v_x, abs_v_y = abs(v_x), abs(v_y) |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
227 |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
228 # We only backout of "solide" collisions |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
229 if sprite.block: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
230 for i, other in enumerate(others): |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
231 if other.block or other.floor: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
232 clip = sprite.collide_rect.clip(other.collide_rect) |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
233 # TODO: avoid continual "if abs_v_? > EPSILON" |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
234 frac_x = clip.width / abs_v_x if abs_v_x > EPSILON else dt |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
235 frac_y = clip.height / abs_v_y if abs_v_y > EPSILON else dt |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
236 if frac_x > frac_y: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
237 if frac_y > frac: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
238 frac, normal, idx = frac_y, (0, 1), i |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
239 else: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
240 if frac_x > frac: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
241 frac, normal, idx = frac_x, (1, 0), i |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
242 |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
243 if idx is not None: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
244 # We can see no solide collisions now |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
245 sprite.deltap(max(-1.1 * frac, -dt)) |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
246 sprite.bounce(others[idx], normal) |
|
128
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
247 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
248 for other in others: |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
249 sprite.collided(other) |
| 39 | 250 |
| 251 def update(self): | |
| 252 if self._last_time is None: | |
| 253 self._last_time = time.time() | |
| 254 return | |
| 255 | |
| 256 # find dt | |
| 257 now = time.time() | |
| 258 self._last_time, dt = now, now - self._last_time | |
| 259 | |
| 260 # gravity | |
|
103
aaef228b6358
Run kitsune, run! And by the running of the kitsune gravity is restored to normal.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
261 dv = self.GRAVITY[0] * dt, self.GRAVITY[1] * dt |
| 39 | 262 for sprite in self._gravitators: |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
263 if sprite.on_solid: |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
264 sprite.deltav((dv[0], 0.0)) |
|
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
265 else: |
|
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
266 sprite.deltav(dv) |
| 39 | 267 |
|
128
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
268 # friction |
|
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
269 for sprite in self._mobiles: |
|
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
270 sprite.apply_friction() |
|
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
271 |
|
416
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
272 # kill sprites outside the world |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
273 inbound = self._bounds.colliderect |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
274 for sprite in self._mobiles: |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
275 if not inbound(sprite): |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
276 sprite.fix_bounds() |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
277 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
278 # position update and collision check (do last) |
| 39 | 279 for sprite in self._mobiles: |
| 280 sprite.deltap(dt) | |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
121
diff
changeset
|
281 sprite_collides = sprite.collide_rect.colliderect |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
282 collisions = [] |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
283 for other in self._collision_groups[sprite.collision_layer]: |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
284 if sprite_collides(other.collide_rect) \ |
|
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
285 and sprite.check_collides(other): |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
286 collisions.append(other) |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
287 if collisions: |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
288 self._backout_collisions(sprite, collisions, dt) |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
289 contact_rect = pygame.Rect( |
|
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
290 (sprite.collide_rect.left, sprite.collide_rect.bottom), |
|
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
291 (sprite.collide_rect.width, 1)) |
|
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
292 collides = contact_rect.colliderect |
|
401
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
293 floors = [] |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
294 if sprite.on_solid: |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
295 # Check if we are still in contact with the ground |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
296 still_on_solid = False |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
297 for other in self._collision_groups[sprite.collision_layer]: |
|
186
72e92893ccb8
Use layers for floor check
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
298 if (other.floor or other.block) and collides(other.floor_rect): |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
299 still_on_solid = True |
|
401
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
300 floors.append(other) |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
301 sprite.on_solid = still_on_solid |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
302 else: |
| 159 | 303 # Are we currently in contact with the ground |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
304 for other in self._collision_groups[sprite.collision_layer]: |
|
186
72e92893ccb8
Use layers for floor check
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
305 if (other.floor or other.block) and collides(other.floor_rect): |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
306 sprite.on_solid = True |
|
401
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
307 floors.append(other) |
|
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
308 sprite.check_floors(floors) |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
309 |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
310 # call update methods |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
311 self._updaters.update() |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
312 |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
313 # Action stuff. |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
314 # Happens after updates, because we only want it for the next frame. |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
315 for sprite in self._actors: |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
316 for other in self._actionables: |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
317 if sprite.collide_rect.colliderect(other.collide_rect): |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
318 sprite.add_actionable(other) |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
319 |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
320 |
| 39 | 321 def draw(self, surface): |
| 322 self._all.draw(surface) | |
|
105
c455b7925212
Global options in skaapsteker.__init__
Stefano Rivera <stefano@rivera.za.net>
parents:
104
diff
changeset
|
323 if options['debug_rects']: |
| 53 | 324 for sprite in self._all: |
| 325 sprite.draw_debug(surface) |