Mercurial > skaapsteker
changeset 69:e4089417766e
FPS counter and tile sprite layering.
author | Jeremy Thurgood <firxen@gmail.com> |
---|---|
date | Sun, 03 Apr 2011 23:25:48 +0200 |
parents | 60aa6c3eb96f |
children | 319fd6b53340 |
files | scripts/level-editor skaapsteker/level.py |
diffstat | 2 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/level-editor Sun Apr 03 23:05:17 2011 +0200 +++ b/scripts/level-editor Sun Apr 03 23:25:48 2011 +0200 @@ -26,7 +26,7 @@ level = Level(levelname) level_surface = level.get_surface() position = [0, 0] - fps = 0 + fpss = [FRAMERATE] while True: events = pygame.event.get() for ev in events: @@ -60,12 +60,12 @@ tilepos = (position[0] // 64, position[1] // 64) text = Text("Level: %s.\nOffset: %r Tile: %r\nFPS: %.1f" - % (levelname, position, tilepos, fps), + % (levelname, position, tilepos, sum(fpss)/len(fpss)), color='white') text.draw(screen_surface, (10, 10)) pygame.display.flip() - fps = 1000 / clock.tick(FRAMERATE) + fpss = (fpss + [1000 / clock.tick(FRAMERATE)])[-FRAMERATE:] def main(): p = optparse.OptionParser(usage="%prog [options] levelname")
--- a/skaapsteker/level.py Sun Apr 03 23:05:17 2011 +0200 +++ b/skaapsteker/level.py Sun Apr 03 23:25:48 2011 +0200 @@ -1,12 +1,13 @@ import json -from pygame import Rect, Surface, constants +from pygame import Rect, Surface from pygame.sprite import Group from pygame.locals import SRCALPHA, HWSURFACE -import data -from sprites import enemies -from sprites.base import TILE_SIZE, find_sprite, Geography +from skaapsteker import data +from skaapsteker.constants import Layers +from skaapsteker.sprites import enemies +from skaapsteker.sprites.base import TILE_SIZE, find_sprite, Geography @@ -36,13 +37,13 @@ return self.tile_factories[tilechar](pos) - def tile_factory(self, image_name, floor=False, block=False, foreground=False): + def tile_factory(self, image_name, floor=False, block=False, layer=Layers.BACKGROUND): image = data.load_image(self.dirname + '/' + image_name) def _tilefac(pos): tile = Geography(pos, image) tile.block = block tile.floor = floor - tile.foreground = foreground + tile._layer = layer return tile return _tilefac