projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More credits.
[naja.git]
/
naja
/
widgets
/
player_bits.py
diff --git
a/naja/widgets/player_bits.py
b/naja/widgets/player_bits.py
index bdb7695637c9879cb7c4c2d410fab08f51f0d3b8..6eeef0905ac0f0b0c76a048c0721aea253e7ab4e 100644
(file)
--- a/
naja/widgets/player_bits.py
+++ b/
naja/widgets/player_bits.py
@@
-6,8
+6,9
@@
import pygame
from naja.constants import BIT_SIZE, BITS
from naja.resources import resources
from naja.constants import BIT_SIZE, BITS
from naja.resources import resources
-from naja.resources.mutators import R90, R180, R270
+from naja.resources.mutators import R90, R180, R270
, EIGHT_BIT
from naja.widgets.base import Widget
from naja.widgets.base import Widget
+from naja.widgets.text import TextWidget
class PlayerBitsWidget(Widget):
class PlayerBitsWidget(Widget):
@@
-20,11
+21,20
@@
class PlayerBitsWidget(Widget):
def prepare(self):
self.surface = pygame.Surface(BIT_SIZE)
def prepare(self):
self.surface = pygame.Surface(BIT_SIZE)
+
+ size = BIT_SIZE[1]
+
+ zero = TextWidget((0, 0), '0', fontsize=24, colour='white')
+ one = TextWidget((0, 0), '1', fontsize=24, colour='white')
+ zero.prepare()
+ zero.pos = (0, (size - zero.size[1]))
+ one.pos = zero.pos
+
bits = (
(BITS.MSB, 'msb', ()),
bits = (
(BITS.MSB, 'msb', ()),
- (BITS.
YELLOW, 'yellow
', ()),
- (BITS.
MAGENTA, 'magenta
', ()),
- (BITS.
CYAN, 'cyan
', ()),
+ (BITS.
RED, 'red
', ()),
+ (BITS.
GREEN, 'green
', ()),
+ (BITS.
BLUE, 'blue
', ()),
(BITS.WEST, 'arrow', (R90,)),
(BITS.EAST, 'arrow', (R270,)),
(BITS.SOUTH, 'arrow', (R180,)),
(BITS.WEST, 'arrow', (R90,)),
(BITS.EAST, 'arrow', (R270,)),
(BITS.SOUTH, 'arrow', (R180,)),
@@
-34,8
+44,13
@@
class PlayerBitsWidget(Widget):
is_set = self.state.player.bits.check_bit(bit)
img = resources.get_image(
'bits', '%s_%s.png' % (image, 'on' if is_set else 'off'),
is_set = self.state.player.bits.check_bit(bit)
img = resources.get_image(
'bits', '%s_%s.png' % (image, 'on' if is_set else 'off'),
- transforms=transforms)
- self.surface.blit(img, (img.get_width() * pos, 0))
+ transforms=transforms + (EIGHT_BIT,))
+ self.surface.blit(img, (size * pos, 0))
+ if is_set:
+ one.render(self.surface)
+ else:
+ zero.render(self.surface)
+ one.pos = zero.pos = (zero.pos[0] + size, zero.pos[1])
def draw(self, surface):
surface.blit(self.surface, self.pos)
def draw(self, surface):
surface.blit(self.surface, self.pos)