ADD: Slider that acts as seek for match
This commit is contained in:
@@ -28,6 +28,7 @@ class Game:
|
|||||||
for event in pygame.event.get():
|
for event in pygame.event.get():
|
||||||
if event.type == pygame.QUIT:
|
if event.type == pygame.QUIT:
|
||||||
self.running = False
|
self.running = False
|
||||||
|
self.renderer.slider.handle_event(event)
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
"""Updates game objects."""
|
"""Updates game objects."""
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import pygame
|
import pygame
|
||||||
import pygame_widgets
|
from widgets.slider import HorizontalSlider
|
||||||
from pygame_widgets.slider import Slider
|
from pygame_widgets.slider import Slider
|
||||||
from models.match import Match
|
from models.match import Match
|
||||||
from models.player import Player
|
from models.player import Player
|
||||||
@@ -35,6 +35,9 @@ class Renderer:
|
|||||||
|
|
||||||
self.map_coord_controller = MapCoordController(self.screen.get_width(), self.screen.get_height(),
|
self.map_coord_controller = MapCoordController(self.screen.get_width(), self.screen.get_height(),
|
||||||
self.top_left_x, self.bottom_right_x, self.top_left_y, self.bottom_right_y)
|
self.top_left_x, self.bottom_right_x, self.top_left_y, self.bottom_right_y)
|
||||||
|
|
||||||
|
self.slider = HorizontalSlider(self.screen, 50, 650, self.screen.get_width()-100, 20, 1, self.match.max_tick)
|
||||||
|
|
||||||
def render_players(self):
|
def render_players(self):
|
||||||
"""Draws everything on screen."""
|
"""Draws everything on screen."""
|
||||||
self.map_coord_controller.update_screen_size(self.screen.get_width(), self.screen.get_height())
|
self.map_coord_controller.update_screen_size(self.screen.get_width(), self.screen.get_height())
|
||||||
@@ -50,8 +53,6 @@ class Renderer:
|
|||||||
text = self.small_font.render(player.name, True, (255, 255, 255))
|
text = self.small_font.render(player.name, True, (255, 255, 255))
|
||||||
self.screen.blit(text, (mapped_x + 10, mapped_y))
|
self.screen.blit(text, (mapped_x + 10, mapped_y))
|
||||||
|
|
||||||
pygame.display.flip() # Update display
|
|
||||||
|
|
||||||
def render_text(self):
|
def render_text(self):
|
||||||
# Draw current tick
|
# Draw current tick
|
||||||
text = self.font.render(f"Tick: {self.match.tick}/{self.match.max_tick}", True, (255, 255, 255))
|
text = self.font.render(f"Tick: {self.match.tick}/{self.match.max_tick}", True, (255, 255, 255))
|
||||||
@@ -68,19 +69,17 @@ class Renderer:
|
|||||||
# Draw map image
|
# Draw map image
|
||||||
self.screen.blit(self.map_image, (0, 0))
|
self.screen.blit(self.map_image, (0, 0))
|
||||||
|
|
||||||
'''
|
def render_slider(self):
|
||||||
def render_slider(self):
|
# Create slider
|
||||||
# Create slider
|
if self.slider.dragging:
|
||||||
slider = Slider(self.screen, 100, 100, 400, 20, min=1, max=self.match.max_tick, step=1, initial=self.match.tick,
|
self.match.set_tick(int(self.slider.value))
|
||||||
handleRadius=10, handleColour=(255, 255, 255), handleOutline=(255, 255, 255),
|
else:
|
||||||
sliderColour=(100, 100, 100), sliderMarkColour=(150, 150, 150),
|
self.slider.set_value(self.match.tick)
|
||||||
font=pygame.font.Font(None, 36), textColour=(255, 255, 255),
|
self.slider.draw()
|
||||||
valueColour=(255, 255, 255), valueOutlineColour=(255, 255, 255),
|
|
||||||
onSlide=self.on_slide, sliderMark=0)
|
|
||||||
'''
|
|
||||||
|
|
||||||
def render(self):
|
def render(self):
|
||||||
self.screen.fill((30, 30, 30)) # Clear screen
|
self.screen.fill((30, 30, 30)) # Clear screen
|
||||||
self.render_map()
|
self.render_map()
|
||||||
self.render_text()
|
self.render_text()
|
||||||
self.render_players()
|
self.render_players()
|
||||||
|
self.render_slider()
|
||||||
Reference in New Issue
Block a user