s444409/DSZI_Survival
s444409/DSZI_Survival
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add antialiasing

Browse Source
This commit is contained in:
Michał Czekański 2020-04-06 15:45:05 +02:00
parent 774d186653
commit 69313b0984
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ui/Ui.py
View File

@ -1,4 +1,5 @@
from enum import Enum from enum import Enum
from pathlib import Path
import pygame import pygame
@ -10,7 +11,7 @@ from src.ui.UiText import UiText
class Ui(): class Ui():
def __init__(self, rightUiWidth, leftUiWidth, screenHeight, timer, font=None): def __init__(self, rightUiWidth, leftUiWidth, screenHeight, timer, font=None, antialias=True):
self.elements = pygame.sprite.Group() self.elements = pygame.sprite.Group()
self.leftUiWidth = leftUiWidth self.leftUiWidth = leftUiWidth
@ -19,26 +20,38 @@ class Ui():
self.barHeight = 25 self.barHeight = 25
self.antialias = antialias
fontName = "FiraCode-Light.ttf"
fontFolder = ""
fontFile = ""
try:
fontFolder = Path("./data/fonts")
fontFile = fontFolder / fontName
except IOError:
print("Cannot load texture from " + fontFolder + ". Exiting...")
exit(1)
fontPath = str(fontFile.resolve())
if font is None: if font is None:
font = pygame.font.Font(None, self.barHeight) font = pygame.font.Font(fontPath, int(self.barHeight / 1.5))
self.font = font self.font = font
self.timer = timer self.timer = timer
self.timerTextView = UiText(pygame.Rect(0, 0, leftUiWidth, self.barHeight), font=self.font, self.timerTextView = UiText(pygame.Rect(0, 0, leftUiWidth, self.barHeight), font=self.font,
text=timer.getPrettyTime(), textColor=Colors.WHITE.value, text=timer.getPrettyTime(), textColor=Colors.WHITE.value,
backgroundColor=Colors.GRAY.value) backgroundColor=Colors.GRAY.value, antialias=self.antialias)
self.isDayTextView = UiText( self.isDayTextView = UiText(
pygame.Rect(0, self.timerTextView.rect.y + self.barHeight, leftUiWidth, self.barHeight), text="Day", pygame.Rect(0, self.timerTextView.rect.y + self.barHeight, leftUiWidth, self.barHeight), text="Day",
font=self.font, backgroundColor=Colors.GRAY.value, textColor=Colors.WHITE.value) font=self.font, backgroundColor=Colors.GRAY.value, textColor=Colors.WHITE.value, antialias=self.antialias)
self.healthTextView = UiText(pygame.Rect(0, 0, rightUiWidth, self.barHeight), text="Health points", self.healthTextView = UiText(pygame.Rect(0, 0, rightUiWidth, self.barHeight), text="Health points",
font=self.font, textColor=Colors.WHITE.value) font=self.font, textColor=Colors.WHITE.value, antialias=self.antialias)
self.healthBar = UiBar( self.healthBar = UiBar(
pygame.Rect(0, self.healthTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight)) pygame.Rect(0, self.healthTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight))
self.hungerTextView = UiText( self.hungerTextView = UiText(
pygame.Rect(0, self.healthBar.rect.y + self.barHeight, rightUiWidth, self.barHeight), pygame.Rect(0, self.healthBar.rect.y + self.barHeight, rightUiWidth, self.barHeight),
text="Hunger", font=self.font, textColor=Colors.WHITE.value) text="Hunger", font=self.font, textColor=Colors.WHITE.value, antialias=self.antialias)
self.hungerBar = UiBar( self.hungerBar = UiBar(
pygame.Rect(0, self.hungerTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight), pygame.Rect(0, self.hungerTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight),
initialFilledPercent=0, initialFilledPercent=0,
@ -46,14 +59,14 @@ class Ui():
self.staminaTextView = UiText( self.staminaTextView = UiText(
pygame.Rect(0, self.hungerBar.rect.y + self.barHeight, rightUiWidth, self.barHeight), text="Stamina", pygame.Rect(0, self.hungerBar.rect.y + self.barHeight, rightUiWidth, self.barHeight), text="Stamina",
font=self.font, textColor=Colors.WHITE.value) font=self.font, textColor=Colors.WHITE.value, antialias=self.antialias)
self.staminaBar = UiBar( self.staminaBar = UiBar(
pygame.Rect(0, self.staminaTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight), pygame.Rect(0, self.staminaTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight),
filledBarColor=Colors.GREEN.value) filledBarColor=Colors.GREEN.value)
self.thirstTextView = UiText( self.thirstTextView = UiText(
pygame.Rect(0, self.staminaBar.rect.y + self.barHeight, rightUiWidth, self.barHeight), text="Thirst", pygame.Rect(0, self.staminaBar.rect.y + self.barHeight, rightUiWidth, self.barHeight), text="Thirst",
font=self.font, textColor=Colors.WHITE.value) font=self.font, textColor=Colors.WHITE.value, antialias=self.antialias)
self.thirstBar = UiBar( self.thirstBar = UiBar(
pygame.Rect(0, self.thirstTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight), pygame.Rect(0, self.thirstTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight),
initialFilledPercent=0, initialFilledPercent=0,
@ -61,7 +74,7 @@ class Ui():
self.console = UiConsole(pygame.Rect(0, self.timerTextView.rect.h + self.isDayTextView.rect.h, leftUiWidth, self.console = UiConsole(pygame.Rect(0, self.timerTextView.rect.h + self.isDayTextView.rect.h, leftUiWidth,
screenHeight - self.timerTextView.rect.h - self.isDayTextView.rect.h), screenHeight - self.timerTextView.rect.h - self.isDayTextView.rect.h),
font=self.font) font=self.font, antialias=self.antialias)
def updateConsoleBasedOnPlayerStats(self, statistics: Statistics): def updateConsoleBasedOnPlayerStats(self, statistics: Statistics):
consoleLines = ["Health: " + str(statistics.hp), "Hunger: " + str(statistics.hunger), consoleLines = ["Health: " + str(statistics.hp), "Hunger: " + str(statistics.hunger),

5
src/ui/UiConsole.py
View File

@ -4,7 +4,7 @@ from src.ui.UiElement import UiElement
class UiConsole(UiElement): class UiConsole(UiElement):
def __init__(self, rect: pygame.Rect, bgColor=(125, 125, 125), textColor=(255, 255, 255), font=None): def __init__(self, rect: pygame.Rect, bgColor=(125, 125, 125), textColor=(255, 255, 255), font=None, antialias=True):
super().__init__(rect) super().__init__(rect)
self.textColor = textColor self.textColor = textColor
@ -12,6 +12,7 @@ class UiConsole(UiElement):
font = pygame.font.Font(None, 25) font = pygame.font.Font(None, 25)
self.font = font self.font = font
self.bgColor = bgColor self.bgColor = bgColor
self.antialias = antialias
self.image = pygame.Surface((rect.width, rect.height)) self.image = pygame.Surface((rect.width, rect.height))
self.image.fill(bgColor) self.image.fill(bgColor)
@ -54,7 +55,7 @@ class UiConsole(UiElement):
howMuchRowIsFilled = 0 howMuchRowIsFilled = 0
words = line.split(' ') words = line.split(' ')
for word in words: for word in words:
wordImage = self.font.render(' ' + word, False, self.textColor) wordImage = self.font.render(' ' + word, self.antialias, self.textColor)
if howMuchRowIsFilled + wordImage.get_width() <= self.consoleWidth: if howMuchRowIsFilled + wordImage.get_width() <= self.consoleWidth:
row.blit(wordImage, (howMuchRowIsFilled, 0)) row.blit(wordImage, (howMuchRowIsFilled, 0))
howMuchRowIsFilled += wordImage.get_width() howMuchRowIsFilled += wordImage.get_width()