diff --git a/effects/presets.py b/effects/presets.py index fd324ff..55dd555 100644 --- a/effects/presets.py +++ b/effects/presets.py @@ -43,7 +43,7 @@ class Presets: self.shuffles = list(iter(self)) * 2 def default(self) -> List[Effect]: - return self.Rectangle() + return self.DoubleBouncingSpotsColorWheel() def __getitem__(self, idx: str) -> List[Effect]: return getattr(self, idx)() @@ -578,20 +578,20 @@ class Presets: ) ] - def Rectangle(self) -> List[Effect]: - return [ - Rectangle( - bounds=self.bounds, - color=color_wheel(increase=(75 if self.beat_reactive else 1)), - size=int(self.bounds.height*0.9), - aspect=1.0, - rot_speed=0.5, - thickness=80, - mover=transform_bounce( - bounds=self.bounds, - velocity=(0.1, 0.5), - x_factor=(0.5, 1), - y_factor=(0.1, 0.3), - ), - ) - ] + # def Rectangle(self) -> List[Effect]: + # return [ + # Rectangle( + # bounds=self.bounds, + # color=color_wheel(increase=(75 if self.beat_reactive else 1)), + # size=int(self.bounds.height*0.9), + # aspect=1.0, + # rot_speed=0.5, + # thickness=80, + # mover=transform_bounce( + # bounds=self.bounds, + # velocity=(0.1, 0.5), + # x_factor=(0.5, 1), + # y_factor=(0.1, 0.3), + # ), + # ) + # ] diff --git a/effects/rectangle.py b/effects/rectangle.py index 5c461e1..7bf94d6 100644 --- a/effects/rectangle.py +++ b/effects/rectangle.py @@ -41,11 +41,11 @@ class Rectangle(MovingEffect): self.thickness = thickness x = calc_x(aspect, thickness, size) - print(x) - print(size) + # print(x) + # print(size) self.rsize = (x, (x + 2 * thickness) * aspect - 2 * thickness) - print(self.rsize) + # print(self.rsize) self.rect_image = pg.Surface(self.rsize) self.rect_image.fill(Colors.Black) @@ -112,7 +112,7 @@ class Rectangle(MovingEffect): # ) r2 = pg.transform.rotate(self.rect_image, self.angle) - print(self.image.get_width()-r2.get_width()) + # print(self.image.get_width()-r2.get_width()) self.image.blit( r2,