enne2/mice
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Modifica la gestione dei tasti nella classe GameWindow; aggiungi supporto per il rilascio dei tasti e migliora la logica di scrolling

Browse Source
This commit is contained in:
Matteo Benedetto
2024-12-23 16:23:40 +01:00
parent 3be35d07ee
commit 2e4d0b8726
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/controls.py
+3 -1
View File
@@ -37,4 +37,6 @@ class KeyBindings:
# elif key == "mouse": # elif key == "mouse":
# adjusted_coords = (coords[0]//self.cell_size*2, coords[1]//self.cell_size*2) # adjusted_coords = (coords[0]//self.cell_size*2, coords[1]//self.cell_size*2)
# self.pointer = adjusted_coords # self.pointer = adjusted_coords
# self.scroll_cursor() # self.scroll_cursor()
def key_released(self, key):
self.stop_scrolling()
engine/sdl2.py
+8 -7
View File
@@ -32,7 +32,7 @@ class GameWindow:
self.factory = sdl2.ext.SpriteFactory(renderer=self.renderer) self.factory = sdl2.ext.SpriteFactory(renderer=self.renderer)
self.fonts = self.generate_fonts("assets/decterm.ttf") self.fonts = self.generate_fonts("assets/decterm.ttf")
self.running = True self.running = True
self.key_callback = key_callback self.key_down, self.key_up = key_callback
self.performance = 0 self.performance = 0
def load_joystick(self): def load_joystick(self):
@@ -140,17 +140,18 @@ class GameWindow:
for event in events: for event in events:
if event.type == sdl2.SDL_QUIT: if event.type == sdl2.SDL_QUIT:
self.running = False self.running = False
elif event.type == sdl2.SDL_KEYDOWN and self.key_callback: elif event.type == sdl2.SDL_KEYDOWN and self.key_down:
key = sdl2.SDL_GetKeyName(event.key.keysym.sym).decode('utf-8') key = sdl2.SDL_GetKeyName(event.key.keysym.sym).decode('utf-8')
self.key_callback(key) self.key_down(key)
elif event.type == sdl2.SDL_KEYUP and self.key_callback: elif event.type == sdl2.SDL_KEYUP and self.key_down:
key = sdl2.SDL_GetKeyName(event.key.keysym.sym).decode('utf-8') + "Release" key = sdl2.SDL_GetKeyName(event.key.keysym.sym).decode('utf-8') + "Release"
self.key_callback(key) self.key_up(key)
print(key)
elif event.type == sdl2.SDL_MOUSEMOTION: elif event.type == sdl2.SDL_MOUSEMOTION:
self.key_callback("mouse", coords=(event.motion.x, event.motion.y)) self.key_down("mouse", coords=(event.motion.x, event.motion.y))
elif event.type == sdl2.SDL_JOYBUTTONDOWN: elif event.type == sdl2.SDL_JOYBUTTONDOWN:
key = event.jbutton.button key = event.jbutton.button
self.key_callback(key) self.key_down(key)
# Disegna qui gli sprite # Disegna qui gli sprite
self.renderer.present() self.renderer.present()
rats.py
+16 -13
View File
@@ -14,7 +14,8 @@ class MiceMaze(controls.KeyBindings):
self.audio = True self.audio = True
self.cell_size = 40 self.cell_size = 40
self.full_screen = False self.full_screen = False
self.engine = engine.GameWindow(self.map.width, self.map.height, self.cell_size, "Mice!", key_callback=self.key_pressed) self.engine = engine.GameWindow(self.map.width, self.map.height,
self.cell_size, "Mice!", key_callback=(self.key_pressed, self.key_released))
self.pointer = (random.randint(1, self.map.width-2), random.randint(1, self.map.height-2)) self.pointer = (random.randint(1, self.map.width-2), random.randint(1, self.map.height-2))
self.scroll_cursor() self.scroll_cursor()
self.points = 0 self.points = 0
@@ -106,6 +107,7 @@ class MiceMaze(controls.KeyBindings):
unit.collisions() unit.collisions()
unit.draw() unit.draw()
self.engine.update_status(f"Mice: {len(self.units)} - Points: {self.points}") self.engine.update_status(f"Mice: {len(self.units)} - Points: {self.points}")
self.scroll()
self.engine.new_cycle(50, self.update_maze) self.engine.new_cycle(50, self.update_maze)
@@ -155,23 +157,24 @@ class MiceMaze(controls.KeyBindings):
def start_scrolling(self, direction): def start_scrolling(self, direction):
self.scrolling_direction = direction self.scrolling_direction = direction
self.scrolling = True if not self.scrolling:
self.scroll() self.scrolling = 1
def stop_scrolling(self): def stop_scrolling(self):
self.scrolling = False self.scrolling = 0
def scroll(self): def scroll(self):
if self.scrolling: if self.scrolling:
if self.scrolling_direction == "Up": if not self.scrolling % 5:
self.scroll_cursor(y=-1) if self.scrolling_direction == "Up":
elif self.scrolling_direction == "Down": self.scroll_cursor(y=-1)
self.scroll_cursor(y=1) elif self.scrolling_direction == "Down":
elif self.scrolling_direction == "Left": self.scroll_cursor(y=1)
self.scroll_cursor(x=-1) elif self.scrolling_direction == "Left":
elif self.scrolling_direction == "Right": self.scroll_cursor(x=-1)
self.scroll_cursor(x=1) elif self.scrolling_direction == "Right":
self.engine.new_cycle(100, self.scroll) self.scroll_cursor(x=1)
self.scrolling += 1
if __name__ == "__main__": if __name__ == "__main__":