Merge branch 'master' of makar:/var/www/git/pgfw
(updated pgfw in another project simultaneously)
This commit is contained in:
commit
2ff6743ea1
|
@ -232,7 +232,8 @@ class AudioPanel(Animation):
|
||||||
|
|
||||||
def respond(self, event):
|
def respond(self, event):
|
||||||
if self.get_delegate().compare(event, "toggle-audio-panel") and \
|
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:
|
if self.active:
|
||||||
self.deactivate()
|
self.deactivate()
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -60,13 +60,13 @@ class Vector(list):
|
||||||
|
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
for sv, ov in zip(self, other):
|
for sv, ov in zip(self, other):
|
||||||
if value != other[ii]:
|
if sv != ov:
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def __ne__(self, other):
|
def __ne__(self, other):
|
||||||
for sv, ov in zip(self, other):
|
for sv, ov in zip(self, other):
|
||||||
if value == other[ii]:
|
if sv == ov:
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
@ -128,8 +128,8 @@ class EVector(Vector):
|
||||||
else:
|
else:
|
||||||
from .extension import get_angle, get_distance
|
from .extension import get_angle, get_distance
|
||||||
end = self.x + dx, self.y + dy
|
end = self.x + dx, self.y + dy
|
||||||
|
self.angle = get_angle(self, end, True)
|
||||||
self.magnitude = get_distance(self, end)
|
self.magnitude = get_distance(self, end)
|
||||||
self.angle = -get_angle(self, end) - pi
|
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return "<dx=%.2f, dy=%.2f, m=%.2f, ang=%.2f>" % \
|
return "<dx=%.2f, dy=%.2f, m=%.2f, ang=%.2f>" % \
|
||||||
|
|
|
@ -35,7 +35,8 @@ def get_points_on_line(start, end, count):
|
||||||
return points
|
return points
|
||||||
|
|
||||||
def get_angle(start, end, transpose=False):
|
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:
|
if transpose:
|
||||||
angle = -angle - pi
|
angle = -angle - pi
|
||||||
return angle
|
return angle
|
||||||
|
|
Loading…
Reference in New Issue