X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Flights.py;h=cda60022a5d5aa227d7a9401ad119ca31ff2ba67;hb=1a2da7901cbe7c7cb9003208d79a1296f8654999;hp=22a089d5cbc11c3ea163d62a0d8f39de4164bfcf;hpb=dbc232cf954fef5deb4204c5757b5e776023d41a;p=tabakrolletjie.git diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py index 22a089d..cda6002 100644 --- a/tabakrolletjie/lights.py +++ b/tabakrolletjie/lights.py @@ -11,11 +11,13 @@ import pygame.locals as pgl import pygame.rect import pygame.transform -from .constants import LIGHT_CATEGORY, FITTINGS_CATEGORY, COLOURS +from .constants import ( + LIGHT_CATEGORY, FITTINGS_CATEGORY, OBSTACLE_CATEGORY, TURNIP_CATEGORY, + COLOURS) from .rays import RayPolyManager from .utils import DetailedTimer from .loader import loader -from .transforms import Multiply +from .transforms import ColourWedges LIGHT_FILTER = pymunk.ShapeFilter( mask=pymunk.ShapeFilter.ALL_MASKS ^ ( @@ -29,6 +31,16 @@ FITTINGS_FILTER = pymunk.ShapeFilter( # Just match lights, nothing else LIT_BY_FILTER = pymunk.ShapeFilter(mask=LIGHT_CATEGORY) +SPACE_FOR_LIGHT_FILTER = pymunk.ShapeFilter( + mask=FITTINGS_CATEGORY | OBSTACLE_CATEGORY | TURNIP_CATEGORY) + + +def check_space_for_light(space, pos, max_distance): + point_info = space.point_query_nearest( + pos, max_distance, SPACE_FOR_LIGHT_FILTER) + if point_info is not None: + return True + return False class LightManager(object): @@ -36,6 +48,7 @@ class LightManager(object): def __init__(self, space, gamestate): self._space = space + self._battery_dead = False self._lights = [ BaseLight.load(cfg) for cfg in gamestate.station["lights"]] for light in self._lights: @@ -46,7 +59,24 @@ class LightManager(object): self._lights.append(light) light.add(self._space) + def remove_light(self, light): + self._lights.remove(light) + light.remove(self._space) + + def battery_dead(self): + self._battery_dead = True + for light in self._lights: + light.off() + + def serialize_lights(self): + result = [] + for light in self._lights: + result.append(light.serialize()) + return result + def toggle_nearest(self, *args, **kw): + if self._battery_dead: + return light = self.nearest(*args, **kw) if light: light.toggle() @@ -66,7 +96,7 @@ class LightManager(object): surface = pygame.display.get_surface() pos = pymunk.pygame_util.from_pygame(pos, surface) point_info_list = self._space.point_query( - pos, max_distance, pymunk.ShapeFilter(mask=LIGHT_CATEGORY)) + pos, max_distance, LIT_BY_FILTER) lights = [p.shape.body.light for p in point_info_list] return [ light for light in lights @@ -102,30 +132,9 @@ class LightManager(object): light.tick() -def light_fitting_image(size, base_image_name, colours): - """ Render a light fitting image. """ - size = str(size) - fitting_colours = [COLOURS[c] for c in colours] - ncolour = len(fitting_colours) - if ncolour > 3: - print "Multicoloured light should not have more than 3 colours" - ncolour = 3 - - if ncolour == 1: - return loader.load_image( - size, base_image_name, - transform=Multiply(colour=fitting_colours[0])) - - colour_mult_image = pygame.surface.Surface((48, 48)) - for i in range(ncolour): - sector = loader.load_image( - size, "light_mask_%d_%d.png" % (ncolour, i + 1), - transform=Multiply(colour=fitting_colours[i])) - colour_mult_image.blit(sector, (0, 0), None, 0) - - fitting_image = loader.load_image(size, base_image_name) - fitting_image.blit(colour_mult_image, (0, 0), None, pgl.BLEND_RGBA_MULT) - return fitting_image +def light_fitting_by_type(light_type): + """ Render a light fitting image for a light type. """ + return BaseLight.find_cls(light_type).FITTING_IMG class BaseLight(object): @@ -141,23 +150,42 @@ class BaseLight(object): def __init__( self, colours, position, intensity=1.0, radius_limits=None, - direction=None, spread=None): + direction=None, spread=None, on=True, start_colour=None, + bounding_radius=None): self.colour_cycle = colours self.colour_pos = 0 self.colour = colours[0] - self.on = True + if start_colour and start_colour in colours: + self.colour_pos = colours.index(start_colour) + self.colour = start_colour + self.on = on + if not on and len(colours) > 1: + self.colour_pos = -1 self.intensity = intensity self.body = pymunk.Body(0, 0, pymunk.body.Body.STATIC) self.body.light = self self.ray_manager = self.RAY_MANAGER( self.body, position, ray_filter=LIGHT_FILTER, - radius_limits=radius_limits, direction=direction, spread=spread) + radius_limits=radius_limits, direction=direction, spread=spread, + bounding_radius=bounding_radius) self.fitting = pymunk.Circle( self.body, self.FITTING_RADIUS, self.ray_manager.position) self.fitting.filter = FITTINGS_FILTER self._fitting_image = None self._colour_mult_image = None + def serialize(self): + result = self.ray_manager.serialize() + result.update({ + "type": self.__class__.__name__.lower(), + "colours": self.colour_cycle, + "position": self.position, + "intensity": self.intensity, + "on": self.on, + "start_colour": self.colour, + }) + return result + @property def position(self): return self.ray_manager.position @@ -166,10 +194,15 @@ class BaseLight(object): def load(cls, config): kw = config.copy() light_type = kw.pop("type") + light_class = cls.find_cls(light_type) + return light_class(**kw) + + @classmethod + def find_cls(cls, light_type): [light_class] = [ c for c in cls.__subclasses__() if c.__name__.lower() == light_type] - return light_class(**kw) + return light_class def add(self, space): if self.body.space is not None: @@ -178,6 +211,10 @@ class BaseLight(object): self.ray_manager.set_space(space) self.ray_manager.update_shapes() + def remove(self, space): + if self.body.space is not None: + space.remove(self.body, *self.body.shapes) + def _cached_surface(self, name, surface): surf = self._surface_cache.get(name) if surf is None: @@ -233,8 +270,9 @@ class BaseLight(object): def fitting_image(self): if self._fitting_image is None: - self._fitting_image = light_fitting_image( - 48, self.FITTING_IMG, self.colour_cycle) + self._fitting_image = loader.load_image( + "48", self.FITTING_IMG, + transform=ColourWedges(colours=self.colour_cycle)) return self._fitting_image def invalidate_fitting_image(self): @@ -252,7 +290,10 @@ class BaseLight(object): return 5 * area * self.intensity / 6400 # 80x80 unit area def base_damage(self): - return 5 * self.intensity + return 10 * self.intensity + + def off(self): + self.on = False def toggle(self): self.colour_pos += 1 @@ -275,7 +316,7 @@ class Lamp(BaseLight): class PulsatingLamp(BaseLight): - FITTING_IMG = "lamp.png" + FITTING_IMG = "pulsatinglamp.png" DEFAULT_PULSE_RANGE = (20, 100) DEFAULT_PULSE_VELOCITY = 2 DEFAULT_INTENSITY_RANGE = (0.0, 0.9) @@ -289,7 +330,15 @@ class PulsatingLamp(BaseLight): "intensity_range", self.DEFAULT_INTENSITY_RANGE) self.intensity_velocity = kw.pop( "intensity_velocity", self.DEFAULT_INTENSITY_VELOCITY) - super(PulsatingLamp, self).__init__(**kw) + super(PulsatingLamp, self).__init__( + bounding_radius=self.pulse_range[1], **kw) + + def serialize(self): + result = super(PulsatingLamp, self).serialize() + result["pulse_velocity"] = self.pulse_velocity + result["intensity_range"] = self.intensity_range + result["intensity_velocity"] = self.intensity_velocity + return result def _update_range(self, value, velocity, value_range): value += velocity @@ -316,6 +365,11 @@ class SpotLight(BaseLight): self.angular_velocity = kw.pop("angular_velocity", None) super(SpotLight, self).__init__(**kw) + def serialize(self): + result = super(SpotLight, self).serialize() + result["angular_velocity"] = self.angular_velocity + return result + def fitting_image(self): fitting_image = super(SpotLight, self).fitting_image() rot_fitting_image = pygame.transform.rotozoom(