X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Flights.py;h=e546b292851510f5b3452d68b1a1d63b7f7c9608;hb=8cce42a8cf2e7a4af99a199f4e24f3ac6c94f654;hp=f1a69d69cdba4540cea2788a893bea63226c66e3;hpb=3a194fea2e071901569813a15e9b25d4c040f1e0;p=tabakrolletjie.git diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py index f1a69d6..e546b29 100644 --- a/tabakrolletjie/lights.py +++ b/tabakrolletjie/lights.py @@ -12,6 +12,7 @@ from .constants import LIGHT_CATEGORY, FITTINGS_CATEGORY from .rays import RayPolyManager from .utils import DetailedTimer from .loader import loader +from .transforms import Multiply LIGHT_FILTER = pymunk.ShapeFilter( mask=pymunk.ShapeFilter.ALL_MASKS ^ ( @@ -203,22 +204,32 @@ class BaseLight(object): def get_image(self): if self._image is None: - self._image = loader.load_image("64", self.FITTING_IMG).copy() fitting_colour = self.COLOURS[self.colour] - self._image.fill(fitting_colour, None, pgl.BLEND_RGBA_MULT) + self._image = loader.load_image( + "48", self.FITTING_IMG, + transform=Multiply(colour=fitting_colour)) return self._image def render_fitting(self, surface): rx, ry = pymunk.pygame_util.to_pygame(self.position, surface) - surface.blit(self.get_image(), (rx - 32, ry - 32), None, 0) + surface.blit(self.get_image(), (rx - 24, ry - 24), None, 0) def tick(self): pass +class Lamp(BaseLight): + FITTING_IMG = "lamp.png" + + def __init__(self, **kw): + kw.pop("direction", None) + kw.pop("spread", None) + super(Lamp, self).__init__(**kw) + + class SpotLight(BaseLight): FITTING_IMG = "spotlight.png" - + def __init__(self, **kw): kw.pop("direction", None) kw.pop("spread", None)