Mercurial > skaapsteker
annotate skaapsteker/physics.py @ 623:65881746dc20
More Sprite hierarchy work.
| author | Jeremy Thurgood <firxen@gmail.com> |
|---|---|
| date | Sat, 07 May 2011 13:59:00 +0200 |
| parents | da331c80ec08 |
| children | 83569a6b3ad8 |
| 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 |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
15 from .utils import cadd, csub, cmul, cdiv, cclamp, cint, cneg, cabs |
|
22
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
16 |
|
128
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
17 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
|
18 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
19 # physics attributes |
|
22
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
20 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
|
21 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
|
22 terminal_velocity = (900.0, 500.0) # maximum horizontal and vertial speeds (pixels / s) |
| 112 | 23 bounce_factor = (0.95, 0.95) # bounce factor |
| 121 | 24 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
|
25 friction_coeff = (0.99, 0.99) # friction factor |
| 39 | 26 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
27 # collision attributes |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
28 # 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
|
29 # 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
|
30 # 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
|
31 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
|
32 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
|
33 |
|
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
|
34 # 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
|
35 wants_updates = False |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
36 |
| 146 | 37 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
|
38 block = False |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
39 |
| 39 | 40 def __init__(self, *args, **kwargs): |
| 41 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
|
42 self.on_solid = False |
| 39 | 43 self.velocity = (0.0, 0.0) |
| 44 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
|
45 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
|
46 self.floor_rect = self.collide_rect |
| 43 | 47 self.image = pygame.Surface((10, 10)) |
| 48 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
|
49 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
|
50 self._mask_cache = {} # image id -> collision bit mask |
| 66 | 51 |
| 52 def init_pos(self): | |
|
622
da331c80ec08
Clean up sprite inheritance hierarchy a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
619
diff
changeset
|
53 self._float_pos = self.rect.center |
| 39 | 54 |
| 121 | 55 |
| 39 | 56 def deltav(self, dv): |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
57 velocity = cadd(self.velocity, dv) |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
58 self.velocity = cclamp(velocity, self.terminal_velocity) |
| 39 | 59 |
| 60 | |
| 61 def deltap(self, dt): | |
|
622
da331c80ec08
Clean up sprite inheritance hierarchy a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
619
diff
changeset
|
62 old_pos = self.rect.center |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
63 self._float_pos = cadd(self._float_pos, cmul(self.velocity, dt)) |
|
622
da331c80ec08
Clean up sprite inheritance hierarchy a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
619
diff
changeset
|
64 self.rect.center = cint(self._float_pos) |
|
da331c80ec08
Clean up sprite inheritance hierarchy a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
619
diff
changeset
|
65 delta_pos = csub(self.rect.center, old_pos) |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
121
diff
changeset
|
66 self.collide_rect.move_ip(delta_pos) |
|
186
72e92893ccb8
Use layers for floor check
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
67 self.floor_rect.move_ip(delta_pos) |
| 66 | 68 |
|
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
|
69 def _check_mask(self): |
|
161
134ed5e026ae
Neatean _check_mask a bit.
Simon Cross <hodgestar@gmail.com>
parents:
159
diff
changeset
|
70 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
|
71 if mask is None: |
|
161
134ed5e026ae
Neatean _check_mask a bit.
Simon Cross <hodgestar@gmail.com>
parents:
159
diff
changeset
|
72 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
|
73 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
|
74 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
75 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
|
76 # 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
|
77 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
|
78 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
|
79 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
|
80 |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
81 def collided(self, other): |
| 98 | 82 pass |
| 66 | 83 |
|
401
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
84 def check_floors(self, floors): |
|
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
85 """Trigger of the current set of floors""" |
|
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
86 pass |
|
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
87 |
|
128
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
88 def apply_friction(self): |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
89 self.velocity = cmul(self.velocity, self.friction_coeff) |
|
128
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
90 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
91 def bounce(self, other, normal): |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
92 """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
|
93 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
94 other: sprite collided with |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
95 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
|
96 surface. |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
97 """ |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
98 bounce_factor = cadd(cmul(self.bounce_factor, other.bounce_factor), 1) |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
99 deltav = cmul(cneg(normal), cmul(self.velocity, bounce_factor)) |
| 121 | 100 |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
101 if normal == (0, 1) and (other.floor or other.block) and self.velocity[1] > 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
|
102 # 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
|
103 self.on_solid = True |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
104 deltav = (deltav[0], -self.velocity[1]) |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
105 |
| 121 | 106 if other.mobile: |
| 107 total_mass = self.mass + other.mass | |
| 108 f_self = self.mass / total_mass | |
| 109 f_other = other.mass / total_mass | |
| 110 | |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
111 self.deltav(cmul(deltav, f_self)) |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
112 self.deltav(cmul(cneg(deltav), f_other)) |
| 121 | 113 else: |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
114 self.deltav(deltav) # oof |
| 39 | 115 |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
116 def update(self): |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
117 pass # only called in wants_update = True |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
118 |
|
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
|
119 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
|
120 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
|
121 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
|
122 |
|
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
|
123 # 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
|
124 # 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
|
125 # 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
|
126 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
|
127 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
|
128 #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
|
129 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
|
130 #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
|
131 # 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
|
132 # 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
|
133 # 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
|
134 |
|
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
|
135 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
|
136 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
|
137 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
|
138 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
|
139 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
|
140 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
|
141 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
|
142 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
|
143 |
|
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 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
|
145 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
|
146 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
|
147 |
|
422
7c0643e51f33
Pass bounds to sprite.fix_bounds
Neil Muller <drnlmuller@gmail.com>
parents:
416
diff
changeset
|
148 def fix_bounds(self, bounds): |
|
416
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
149 self.kill() |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
150 |
|
22
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
151 |
|
b815471d4b95
Move sprite base class into physics since they're tightly coupled.
Simon Cross <hodgestar@gmail.com>
parents:
18
diff
changeset
|
152 class World(object): |
|
23
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
153 |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
154 GRAVITY = cmul((0.0, 9.8), 80.0) # pixels / s^2 |
| 39 | 155 |
|
416
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
156 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
|
157 self._all = pygame.sprite.LayeredUpdates() |
|
23
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
158 self._mobiles = pygame.sprite.Group() |
|
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
159 self._gravitators = pygame.sprite.Group() |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
160 self._updaters = pygame.sprite.Group() |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
161 self._actionables = pygame.sprite.Group() |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
162 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
|
163 self._collision_groups = { None: pygame.sprite.Group() } |
| 39 | 164 self._last_time = None |
|
416
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
165 self._bounds = bounds |
|
23
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
166 |
|
104
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
167 def freeze(self): |
|
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
168 self._last_time = None |
|
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
169 |
|
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
170 def thaw(self): |
|
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
171 self._last_time = time.time() |
|
12ce1d131a72
Hack in resume game option
Neil Muller <drnlmuller@gmail.com>
parents:
103
diff
changeset
|
172 |
|
23
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
173 def add(self, sprite): |
| 66 | 174 sprite.init_pos() |
|
23
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
175 self._all.add(sprite) |
|
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
176 if sprite.mobile: |
|
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
177 self._mobiles.add(sprite) |
|
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
178 if sprite.gravitates: |
|
5c9f2eeeb629
Very start of world / physics engine.
Simon Cross <hodgestar@gmail.com>
parents:
22
diff
changeset
|
179 self._gravitators.add(sprite) |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
180 if sprite.wants_updates: |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
181 self._updaters.add(sprite) |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
182 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
|
183 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
|
184 self._add_collision_group(layer) |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
185 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
|
186 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
|
187 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
|
188 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
|
189 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
|
190 self._actionables.add(sprite) |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
191 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
|
192 self._actors.add(sprite) |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
193 |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
194 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
|
195 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
|
196 return |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
197 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
|
198 |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
199 def _backout_collisions(self, sprite, others, dt): |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
200 frac, normal, idx = 0.0, None, None |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
201 abs_v_x, abs_v_y = cabs(sprite.velocity) |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
202 |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
203 # We only backout of "solide" collisions |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
204 if sprite.block: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
205 for i, other in enumerate(others): |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
206 if other.block or other.floor: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
207 clip = sprite.collide_rect.clip(other.collide_rect) |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
208 # TODO: avoid continual "if abs_v_? > EPSILON" |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
209 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
|
210 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
|
211 if frac_x > frac_y: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
212 if frac_y > frac: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
213 frac, normal, idx = frac_y, (0, 1), i |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
214 else: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
215 if frac_x > frac: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
216 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
|
217 |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
218 if idx is not None: |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
219 # We can see no solide collisions now |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
220 sprite.deltap(max(-1.1 * frac, -dt)) |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
267
diff
changeset
|
221 sprite.bounce(others[idx], normal) |
|
128
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
222 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
223 for other in others: |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
224 sprite.collided(other) |
| 39 | 225 |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
226 |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
227 def do_gravity(self, dt): |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
228 dv = cmul(self.GRAVITY, dt) |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
229 for sprite in self._gravitators: |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
230 if sprite.on_solid: |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
231 sprite.deltav((dv[0], 0.0)) |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
232 else: |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
233 sprite.deltav(dv) |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
234 |
|
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
235 |
| 39 | 236 def update(self): |
| 237 if self._last_time is None: | |
| 238 self._last_time = time.time() | |
| 239 return | |
| 240 | |
| 241 # find dt | |
| 242 now = time.time() | |
| 243 self._last_time, dt = now, now - self._last_time | |
| 244 | |
|
619
4ffa9d159588
Some coordinate operators, to reduce foo_x, foo_y everywhere.
Jeremy Thurgood <firxen@gmail.com>
parents:
553
diff
changeset
|
245 self.do_gravity(dt) |
| 39 | 246 |
|
128
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
247 # friction |
|
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
248 for sprite in self._mobiles: |
|
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
249 sprite.apply_friction() |
|
36267deaccd8
Add friction. Remove old dirty sprite attributes.
Simon Cross <hodgestar@gmail.com>
parents:
122
diff
changeset
|
250 |
|
416
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
251 # kill sprites outside the world |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
252 inbound = self._bounds.colliderect |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
253 for sprite in self._mobiles: |
|
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
254 if not inbound(sprite): |
|
422
7c0643e51f33
Pass bounds to sprite.fix_bounds
Neil Muller <drnlmuller@gmail.com>
parents:
416
diff
changeset
|
255 sprite.fix_bounds(self._bounds) |
|
416
3db2fc263d11
Kill sprites that leave the level area.
Simon Cross <hodgestar@gmail.com>
parents:
401
diff
changeset
|
256 |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
257 # position update and collision check (do last) |
| 39 | 258 for sprite in self._mobiles: |
| 259 sprite.deltap(dt) | |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
121
diff
changeset
|
260 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
|
261 collisions = [] |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
262 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
|
263 if sprite_collides(other.collide_rect) \ |
|
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
264 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
|
265 collisions.append(other) |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
266 if collisions: |
|
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
85
diff
changeset
|
267 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
|
268 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
|
269 (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
|
270 (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
|
271 collides = contact_rect.colliderect |
|
401
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
272 floors = [] |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
146
diff
changeset
|
273 if sprite.on_solid: |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
274 # 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
|
275 still_on_solid = False |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
276 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
|
277 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
|
278 still_on_solid = True |
|
401
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
279 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
|
280 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
|
281 else: |
| 159 | 282 # 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
|
283 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
|
284 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
|
285 sprite.on_solid = True |
|
401
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
286 floors.append(other) |
|
55e00f186c6f
imported patch floor_checks
Neil Muller <drnlmuller@gmail.com>
parents:
273
diff
changeset
|
287 sprite.check_floors(floors) |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
128
diff
changeset
|
288 |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
289 # call update methods |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
290 self._updaters.update() |
|
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
112
diff
changeset
|
291 |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
292 # Action stuff. |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
293 # 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
|
294 for sprite in self._actors: |
| 460 | 295 actor_collide_rect = sprite.collide_rect.inflate((4, 4)) |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
296 for other in self._actionables: |
| 460 | 297 other_actor_collide_rect = other.collide_rect.inflate((4, 4)) |
| 298 if actor_collide_rect.colliderect(other_actor_collide_rect): | |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
299 sprite.add_actionable(other) |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
300 |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
271
diff
changeset
|
301 |
| 39 | 302 def draw(self, surface): |
| 303 self._all.draw(surface) | |
|
105
c455b7925212
Global options in skaapsteker.__init__
Stefano Rivera <stefano@rivera.za.net>
parents:
104
diff
changeset
|
304 if options['debug_rects']: |
| 53 | 305 for sprite in self._all: |
| 306 sprite.draw_debug(surface) |