Bounceball

Author: intendednull

src/animate.py

@@ -6,7 +6,6 @@
 import math
 from typing import NamedTuple, Callable, TypeVar, Generator
 from enum import Enum
-from dataclasses import dataclass
 from functools import partialmethod
 
 
@@ -54,16 +53,12 @@ def running(self):
         return bool(self._motions)
 
 
-@dataclass
 class Motion:
-    """
-
-    """
-    canvas: tk.Canvas
-    id: int
-    end: Coord
-
-    speed: int = 1
+    def __init__(self, canvas: tk.Canvas, id: str, end: Coord, speed: float = 1):
+        self.canvas = canvas
+        self.id = id
+        self.end = end
+        self.speed = speed ** 3
 
     def __iter__(self):
         return self.start()
@@ -82,9 +77,8 @@ def start(self) -> Generator[Callable]:
         The entry point for generating move commands.
         """
         self.time = time.time()
-        self.start = self.current
-        self.distance = self.start.distance(self.end)
-        self.speed = self.speed ** 3
+        self.beg = self.current
+        self.distance = self.beg.distance(self.end)
         while self.current != self.end:
             yield self.move
 
@@ -102,13 +96,16 @@ def time(self, val):
 
     @property
     def increment(self):
-        mult = (self.time * self.speed) / self.distance
-        point = (self.end - self.start) * mult + self.start
-
-        if point.distance(self.end) > self.journey:
+        future = self.future
+        if future.distance(self.end) > self.journey:
             return self.end - self.current
         else:
-            return point - self.current
+            return future - self.current
+
+    @property
+    def future(self):
+        mult = (self.time * self.speed) / self.distance
+        return (self.end - self.beg) * mult + self.beg
 
     @property
     def current(self):
@@ -119,6 +116,56 @@ def journey(self):
         return self.current.distance(self.end)
 
 
+class BounceBall(Motion):
+
+    def kick(self, direction: Point, speed=8):
+        self.direction = direction
+        self.speed = speed
+        self.end = self.direction + self.current
+
+    @property
+    def increment(self):
+        self.canvas.update()
+        self.end += self.get_bounce()
+        return self.future - self.current
+
+    def get_bounce(self):
+        x1, y1, x2, y2 = self.canvas.bbox(self.id)
+
+        bounce = Coord(0, 0)
+        if x1 <= self.bound_x1:
+            print('x1', x1, self.bound_x1)
+            bounce += Direction.RIGHT
+        if y1 >= self.bound_y1:
+            print('y1', y1, self.bound_y1)
+            bounce += Direction.UP
+        if x2 >= self.bound_x2:
+            print('x2', x2, self.bound_x2)
+            bounce += Direction.LEFT
+        if y2 >= self.bound_y2:
+            print('y2', y2, self.bound_y2)
+            bounce += Direction.DOWN
+        return bounce
+
+    @property
+    def bound_x1(self):
+        return self.canvas.winfo_x()
+
+    @property
+    def bound_y1(self):
+        return self.canvas.winfo_y()
+
+    @property
+    def bound_x2(self):
+        # self.canvas.update()
+        return self.bound_x1 + self.canvas.winfo_width()
+
+    @property
+    def bound_y2(self):
+        # self.canvas.update()
+        return self.bound_y1 + self.canvas.winfo_height()
+
+
 class Coord(NamedTuple):
     """
     Helper class for managing coordinate values.
@@ -149,10 +196,10 @@ class Coord(NamedTuple):
     Operand = TypeVar('Operand', 'Coord', float)
 
     def __apply(self, op: Callable, other: Coord.Operand) -> Coord:
-        if not isinstance(other, self.__class__):
-            other = self.__class__(other, other)
         if isinstance(other, Direction):
             other = other.value
+        elif not isinstance(other, self.__class__):
+            other = self.__class__(other, other)
 
         x = op(self.x, other.x)
         y = op(self.y, other.y)
@@ -183,6 +230,9 @@ def distance(self, other: Coord) -> float:
         diff = other - self
         return math.hypot(*diff)
 
+    def flip(self):
+        return Coord(0, 0) - self
+
     __add__ = partialmethod(__apply, operator.add)
     __sub__ = partialmethod(__apply, operator.sub)
     __mul__ = partialmethod(__apply, operator.mul)

src/main.py

@@ -3,7 +3,7 @@
 from contextlib import suppress
 
 from .front import Front
-# from .splash import Splash
+from .splash import Splash
 from . import SETTINGS, widget
 
 
@@ -23,13 +23,13 @@ def __init__(self, *args, **kwds):
 
         self.frame = widget.PrimaryFrame(self)
         self.frame.pack(expand=True, fill='both')
-
-        # self.splash = Splash(self.frame)
-        # self.splash.pack(expand=True, fill='both')
-        self.front = Front(self.frame)
-        self.front.pack(fill='both', expand=True)
+    
+        self.splash = Splash(self.frame)
+        self.splash.pack(expand=True, fill='both')
+        # self.front = Front(self.frame)
+        # self.front.pack(fill='both', expand=True)
 
     def cleanup(self):
         with suppress(Exception):
-            self.front.cleanup()
+            # self.front.cleanup()
             self.destroy()

src/splash.py

@@ -1,6 +1,7 @@
 import json
 
-from .view import Window, View
+from .view import Window, View, BounceBall
+from .animate import Direction
 from . import widget, DOCS
 
 
@@ -33,24 +34,32 @@ class Splash(widget.PrimaryFrame):
         questions = json.load(fp)
 
     def init(self):
+        self.window = Window(self, bg='gray')
         self.title = widget.PrimaryLabel(
             self, text=self.master.master.title(),
-            font=('Courier', 14), wraplength=300
+            font=('Courier', 17), wraplength=300
         )
-
-        self.window = Window(self, bg='gray')
         self.intro = View(
             self.window,
             text=self.intro,
             width=self.window.winfo_reqwidth(),
-            font=('sys', 10), justify='center'
+            font=('sys', 12), justify='center'
         )
         self.window.set_view(self.intro)
 
-        self.btn_confirm = widget.PrimaryButton(self, command=self.begin, text='Okay')
+        self.btn_confirm = widget.PrimaryButton(self.window, command=self.begin, text='Okay')
+
+        self.title.pack(fill='x', pady=10)
+        self.window.pack(fill='both', expand=True)
+        self.bounce()
+
+    def bounce(self):
+        bouncer = View(self.window, window=self.btn_confirm)
+        wid = self.window.set_view(bouncer, self.window.center)
+        motion = BounceBall(self.window, wid, self.window.origin)
+        motion.kick(Direction.RIGHT)
 
-        self.title.pack(fill='x', pady=20)
-        self.btn_confirm.pack(side='bottom', expand=True)
+        self.after(0, self.window.run, motion)
 
     def begin(self):
         pass

src/view.py

@@ -3,7 +3,7 @@
 from enum import Enum
 
 from . import widget
-from .animate import Coord, Animater, Direction
+from .animate import Coord, Animater, Direction, Motion
 
 
 class Window(widget.PrimaryCanvas):
@@ -19,12 +19,12 @@ def __coord(self, id):
 
     def __set(self, view: View, coord: Coord):
         wid = view.draw(coord, anchor='nw')
+        self.current = view
         self.views[view] = wid
         return wid
 
-    def set_view(self, view: View):
-        self.current = view
-        self.__set(self.current, self.origin)
+    def set_view(self, view: View, coord: Coord = None):
+        return self.__set(view, coord or self.origin)
 
     def move_view(self, view: View, end: Coord):
         wid = self.views.get(view)
@@ -52,14 +52,11 @@ def change_view(self, view: View, direction: Direction = None):
             return
         if not isinstance(direction, Direction):
             direction = Direction[direction.upper()]  # Cast string for convenience
-
         self.animater.clear()
-
         last = self.current
-        self.current = view
+
         self.move_in(self.current, direction.flip())
         self.move_out(last, direction)
-
         self.animater.start()
 
     def get_distance(self, direction: Direction):
@@ -73,6 +70,10 @@ def get_distance(self, direction: Direction):
         else:
             raise NotImplementedError
 
+    def run(self, motion: Motion):
+        self.animater.add(motion)
+        self.animater.start()
+
     @property
     def active(self):
         return self.animater.running
@@ -81,6 +82,11 @@ def active(self):
     def origin(self):
         return Coord(self.canvasx(0), self.canvasy(0))
 
+    @property
+    def center(self):
+        br = self.origin + Coord(self.winfo_reqwidth(), self.winfo_reqheight())
+        return self.origin.midpoint(br)
+
 
 class DrawType(Enum):
     image = 'create_image'