sadpmpk
/
pyFloatingBridge
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up deck rendering

master
En Yi 2019-06-10 17:48:43 +01:00
parent 51239f9182
commit 64f60514d7
2 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cards.py
View File

@ -201,39 +201,21 @@ class Deck():
number_of_cards = len(self.cards) number_of_cards = len(self.cards)
if number_of_cards > 0: if number_of_cards > 0:
if self.is_horizontal(): total_card_length = self.cards[0].width + self.default_spacing * (number_of_cards - 1)
total_card_length = self.cards[0].width + self.default_spacing * (number_of_cards-1) if total_card_length <= self.length - 2 * self.line_width:
if total_card_length <= self.length - 2*self.line_width: start_point = (self.length - total_card_length) / 2
start_point = (self.length - total_card_length)/2 spacing = self.default_spacing
for (i, card) in enumerate(self.cards):
x = start_point + self.default_spacing * i
y = (self.width - self.cards[0].height) / 2
card.set_pos(x, y)
else:
adjusted_spacing = (self.length - self.cards[0].width - 2*self.line_width)/(number_of_cards-1)
start_point = self.line_width
for (i, card) in enumerate(self.cards):
x = start_point + adjusted_spacing * i
y = (self.width - self.cards[0].height) / 2
card.set_pos(x, y)
else: else:
total_card_length = self.cards[0].height + self.default_spacing * (number_of_cards-1) start_point = self.line_width
spacing = (self.length - self.cards[0].width - 2*self.line_width)/(number_of_cards-1)
if total_card_length <= self.length: for (i, card) in enumerate(self.cards):
start_point = (self.length - total_card_length)/2 x = start_point + spacing * i
for (i, card) in enumerate(self.cards): y = (self.width - self.cards[0].height) / 2
y = start_point + self.default_spacing * i if self.is_horizontal():
x = (self.width - self.cards[0].height) / 2 card.set_pos(x, y)
card.set_pos(x, y)
else: else:
adjusted_spacing = (self.length - self.cards[0].height)/(number_of_cards-1) card.set_pos(y, x)
start_point = 0
for (i, card) in enumerate(self.cards):
y = start_point + adjusted_spacing * i
x = (self.width - self.cards[0].width) / 2
card.set_pos(x, y)
self.update_deck_display() self.update_deck_display()

3
table.py
View File

@ -145,7 +145,8 @@ class Table:
self.players.append(players.Player(playerx[i], playery[i], self.players.append(players.Player(playerx[i], playery[i],
l_deck, w_deck, l_deck, w_deck,
spacing, vert_orientation=vert, spacing, vert_orientation=vert,
deck_reveal=reveal_mode, flip=(i == 1 or i == 2))) deck_reveal=reveal_mode, flip=(i == 1 or i == 2),
draw_from_last=(i == 2 or i == 3)))
self.players[i].connect_to_table(self.table_status) self.players[i].connect_to_table(self.table_status)
if i > 0: if i > 0:
self.players[i].add_ai(ai.RandomAI(self.table_status)) self.players[i].add_ai(ai.RandomAI(self.table_status))