From 947deab207f4a87c403bf8da9cfe252add5722ed Mon Sep 17 00:00:00 2001 From: Frank DeMarco Date: Fri, 28 Feb 2020 14:56:13 -0500 Subject: [PATCH 1/3] prevent audio panel from loading when there are no sfx --- pgfw/Audio.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pgfw/Audio.py b/pgfw/Audio.py index 2d4c5de..5c81c2c 100644 --- a/pgfw/Audio.py +++ b/pgfw/Audio.py @@ -166,7 +166,8 @@ class AudioPanel(Animation): def respond(self, event): if self.get_delegate().compare(event, "toggle-audio-panel") and \ - pygame.key.get_mods() & KMOD_CTRL and pygame.key.get_mods() & KMOD_SHIFT: + pygame.key.get_mods() & KMOD_CTRL and pygame.key.get_mods() & KMOD_SHIFT and \ + self.get_audio().sfx: if self.active: self.deactivate() else: From d5cd0de7a6240aa1077490bbd4f3baef8f136219 Mon Sep 17 00:00:00 2001 From: Frank DeMarco Date: Wed, 4 Mar 2020 19:25:35 -0500 Subject: [PATCH 2/3] reverting get angle to counterclockwise, x/y swapped version --- pgfw/Vector.py | 2 +- pgfw/extension.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pgfw/Vector.py b/pgfw/Vector.py index 8ba476f..faa79fa 100644 --- a/pgfw/Vector.py +++ b/pgfw/Vector.py @@ -128,8 +128,8 @@ class EVector(Vector): else: from .extension import get_angle, get_distance end = self.x + dx, self.y + dy + self.angle = get_angle(self, end, True) self.magnitude = get_distance(self, end) - self.angle = -get_angle(self, end) - pi def __repr__(self): return "" % \ diff --git a/pgfw/extension.py b/pgfw/extension.py index 0295350..55409b7 100644 --- a/pgfw/extension.py +++ b/pgfw/extension.py @@ -35,7 +35,8 @@ def get_points_on_line(start, end, count): return points def get_angle(start, end, transpose=False): - angle = atan2(end[1] - start[1], end[0] - start[0]) + """counterclockwise, 0 is down""" + angle = atan2(end[0] - start[0], end[1] - start[1]) if transpose: angle = -angle - pi return angle From ed14f31b63e48275ace049d556bfdfe6b2c6c01f Mon Sep 17 00:00:00 2001 From: Frank DeMarco Date: Wed, 4 Mar 2020 19:37:56 -0500 Subject: [PATCH 3/3] fixed bug in vector equals comparison --- pgfw/Vector.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pgfw/Vector.py b/pgfw/Vector.py index faa79fa..d98ce62 100644 --- a/pgfw/Vector.py +++ b/pgfw/Vector.py @@ -60,13 +60,13 @@ class Vector(list): def __eq__(self, other): for sv, ov in zip(self, other): - if value != other[ii]: + if sv != ov: return False return True def __ne__(self, other): for sv, ov in zip(self, other): - if value == other[ii]: + if sv == ov: return False return True