projects
/
tabakrolletjie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cb921f7
)
started adding fittings to lights
author
adrianna
<adrianna.pinska@gmail.com>
Fri, 9 Sep 2016 20:13:29 +0000
(22:13 +0200)
committer
adrianna
<adrianna.pinska@gmail.com>
Fri, 9 Sep 2016 20:13:29 +0000
(22:13 +0200)
tabakrolletjie/lights.py
patch
|
blob
|
history
diff --git
a/tabakrolletjie/lights.py
b/tabakrolletjie/lights.py
index 59bbe173bccc20ff36d5402cc2b65ca9a7aa10bc..f0ec535577d644d556c31cbe636ea3c4749afb0d 100644
(file)
--- a/
tabakrolletjie/lights.py
+++ b/
tabakrolletjie/lights.py
@@
-11,6
+11,7
@@
import pygame.rect
from .constants import LIGHT_CATEGORY, FITTINGS_CATEGORY
from .rays import RayPolyManager
from .utils import DetailedTimer
from .constants import LIGHT_CATEGORY, FITTINGS_CATEGORY
from .rays import RayPolyManager
from .utils import DetailedTimer
+from .loader import loader
LIGHT_FILTER = pymunk.ShapeFilter(
mask=pymunk.ShapeFilter.ALL_MASKS ^ (
LIGHT_FILTER = pymunk.ShapeFilter(
mask=pymunk.ShapeFilter.ALL_MASKS ^ (
@@
-94,6
+95,8
@@
class BaseLight(object):
"white": (255, 255, 255),
}
"white": (255, 255, 255),
}
+ FITTING_IMG = None
+
# cached surfaces
_surface_cache = {}
# cached surfaces
_surface_cache = {}
@@
-111,6
+114,7
@@
class BaseLight(object):
self.fitting.filter = FITTINGS_FILTER
self.body.light = self
self.ray_manager = RayPolyManager(self.body, LIGHT_FILTER)
self.fitting.filter = FITTINGS_FILTER
self.body.light = self
self.ray_manager = RayPolyManager(self.body, LIGHT_FILTER)
+ self._image = None
@classmethod
def load(cls, config):
@classmethod
def load(cls, config):
@@
-197,17
+201,24
@@
class BaseLight(object):
dt.lap("blitted surface")
dt.end()
dt.lap("blitted surface")
dt.end()
+ def get_image(self):
+ if self._image is None:
+ self._image = loader.load_image("64", self.FITTING).copy()
+ fitting_colour = self.COLOURS[self.colour]
+ self._image.fill(fitting_colour, None, pgl.BLEND_RGBA_MULT)
+ return self._image
+
def render_fitting(self, surface):
def render_fitting(self, surface):
- pygame.draw.circle(
- surface, (255, 255, 0),
- pymunk.pygame_util.to_pygame(self.fitting.offset, surface),
- int(self.fitting.radius))
+ rx, ry = pymunk.pygame_util.to_pygame(self.position, surface)
+ surface.blit(self.get_image(), (rx - 32, ry - 32), None, 0)
def tick(self):
pass
class SpotLight(BaseLight):
def tick(self):
pass
class SpotLight(BaseLight):
+ FITTING = "spotlight.png"
+
def __init__(self, **kw):
kw.pop("direction", None)
kw.pop("spread", None)
def __init__(self, **kw):
kw.pop("direction", None)
kw.pop("spread", None)