Merge branch 'animation' into dev

Author: intendednull

Pipfile.lock

@@ -0,0 +1,5 @@
+{
+    "image": "https://api.thecatapi.com/v1/images/search",
+    "info": "https://www.pawclub.com.au/assets/js/namesTemp.json",
+    "hobbies": "https://gist.githubusercontent.com/mbejda/453fdb77ef8d4d3b3a67/raw/e8334f09109dc212892406e25fdee03efdc23f56/hobbies.txt"
+}

res/api.json

@@ -0,0 +1,5 @@
+Note:
+
+Through this quiz you will achieve new levels of spiritual insight, of not only yourself, but the very fabric of reality.
+
+Please answer these very important questions with the utmost honesty, they are crucial to achieving true enlightenment.

res/docs/intro.txt

@@ -0,0 +1,3 @@
+{
+    "What is your least favorite color?": ["#0801d5", "#ee018d", "#03a130", "#db0013", "#fd9501"]
+}

res/docs/questions.json

@@ -1,20 +1,3 @@
-[DEFAULT]
-main.title = App
-main.geometry = 400x500
-main.background = black
-cachesize = 10
-catapi = https://api.thecatapi.com/v1/images/search
-namefile = https://www.pawclub.com.au/assets/js/namesTemp.json
-hobbiesfile = https://gist.githubusercontent.com/mbejda/453fdb77ef8d4d3b3a67/raw/e8334f09109dc212892406e25fdee03efdc23f56/hobbies.txt
-like.text = Like
-like.background = red
-dislike.text = Dislike
-dislike.background = red
-back.text = Back to Photo
-back.background = blue
-bio.text = Bio
-bio.background = blue
-
-
 [APP]
-title = App
+title = The Always (One-Hundred Percent of the Time) Correct and Never Wrong (In Any Way), Completely Accurate Personality Quiz Adventure
+geometry = 400x500

res/images/checkbox.png

@@ -8,3 +8,5 @@
 THEME: Path = RES / 'widgets.ini'
 IMAGES: Path = RES / 'images'
 SOUNDS: Path = RES / 'sounds'
+API: Path = RES / 'api.json'
+DOCS: Path = RES / 'docs'

res/images/loading.gif

@@ -1,4 +1,6 @@
 from .main import App
 
 if __name__ == "__main__":
-    App().mainloop()
+    root = App()
+    root.protocol('WM_DELETE_WINDOW', root.cleanup)
+    root.mainloop()

res/settings.ini

@@ -3,10 +3,120 @@
 import tkinter as tk
 import operator
 import time
-from typing import NamedTuple, Callable, TypeVar, Generator, Tuple
+import math
+from typing import NamedTuple, Callable, TypeVar, Generator
 from enum import Enum
 from dataclasses import dataclass
-from functools import partialmethod, partial
+from functools import partialmethod
+
+
+class Animater:
+    """
+    Manager for executing animations.
+
+    example::
+
+    ```
+    motion = Motion(...)
+    window = Animater(...)
+    window.add_motion(motion)
+    ```
+    """
+    _motions = set()
+
+    def __init__(self, canvas: tk.Canvas):
+        self.canvas = canvas
+
+    def start(self):
+        while self._motions:
+            self.run()
+
+    def run(self):
+        for motion in self._motions.copy():
+            try:
+                move = next(motion)
+                move()
+            except StopIteration:
+                self._motions.remove(motion)
+
+    def add(self, motion: Motion):
+        self._motions.add(motion.start())
+
+    def add_motion(self, id: int, end: Coord, **kwargs):
+        motion = Motion(self.canvas, id, end, **kwargs)
+        self.add(motion)
+
+    def clear(self):
+        self._motions.clear()
+
+    @property
+    def running(self):
+        return bool(self._motions)
+
+
+@dataclass
+class Motion:
+    """
+
+    """
+    canvas: tk.Canvas
+    id: int
+    end: Coord
+
+    speed: int = 1
+
+    def __iter__(self):
+        return self.start()
+
+    def __key(self):
+        return self.id
+
+    def __hash__(self):
+        return hash(self.__key())
+
+    def __eq__(self):
+        return isinstance(self, type(other)) and self.__key() == other.__key()
+
+    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
+        while self.current != self.end:
+            yield self.move
+
+    def move(self):
+        self.canvas.move(self.id, *self.increment)
+        self.canvas.update_idletasks()
+
+    @property
+    def time(self):
+        return time.time() - self._time
+
+    @time.setter
+    def time(self, val):
+        self._time = 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:
+            return self.end - self.current
+        else:
+            return point - self.current
+
+    @property
+    def current(self):
+        return Coord(*self.canvas.coords(self.id))
+
+    @property
+    def journey(self):
+        return self.current.distance(self.end)
 
 
 class Coord(NamedTuple):
@@ -60,18 +170,18 @@ def midpoint(self, other: Coord) -> Coord:
         """
         return (self + other) / 2
 
-    def distance(self, other: Coord) -> int:
+    def distance(self, other: Coord) -> float:
         """
-        The Manhattan distance between `self` and `other`.
+        The distance between `self` and `other`.
 
         param:
             other: Coord -- THe point to consider.
 
         return:
             int -- A numeric representation of the distance between two points.
         """
-        dist = map(abs, other - self)
-        return sum(dist)
+        diff = other - self
+        return math.hypot(*diff)
 
     __add__ = partialmethod(__apply, operator.add)
     __sub__ = partialmethod(__apply, operator.sub)
@@ -111,127 +221,3 @@ def __add__(self, other: Direction) -> Coord:
 
     def flip(self):
         return Direction(Coord(0, 0) - self.value)
-
-
-class Animater:
-    """
-    Manager for executing animations.
-
-    example::
-
-    ```
-    motion = Motion(...)
-    window = Animater(...)
-    window.add_motion(motion)
-    ```
-    """
-    _motions = set()
-    fps = 60
-
-    def __init__(self, canvas: tk.Canvas):
-        self.canvas = canvas
-
-    def start(self):
-        while self._motions:
-            time.sleep(1/self.fps)
-            self.run()
-
-    def run(self):
-        for motion in self._motions:
-            try:
-                next(motion)()
-                self.canvas.update()
-            except StopIteration:
-                self._motions.remove(motion)
-                break
-
-    def add(self, motion: Motion):
-        self._motions.add(iter(motion))
-
-    def add_motion(self, id: int, end: Coord, **kwargs):
-        motion = Motion(self.canvas, id, (end,), **kwargs)
-        self.add(motion)
-
-    def clear(self):
-        self._motions.clear()
-
-
-@dataclass
-class Motion:
-    """
-    Defines the movements derived from a generated vector.
-    The result is a two dimensional generator: the first dimension yields
-    a "frame" generator, which in turn yields move commands. This structure allows
-    for different `speed`s of motion, as the length of the second
-    dimension is determined by `speed`. In other words, the `speed` determines
-    how many movements occur in one frame.
-
-    param:
-        canvas: tk.Canvas -- The parent canvas to issue the move command with.
-        id: int -- The id of the widget to be animated.
-        endpoints: Tuple[Coord] -- The final position(s) of the widget. Multiple positions allow for
-            more intricate pathing.
-        speed: int (optional) -- The multipler for move commands per frame.
-            Defaults to 1.
-
-    example::
-
-    ```
-    root = tk.Tk()
-
-    window = Animater(root)
-    window.pack()
-
-    c1 = Coord(50, 55)
-    c2 = Coord(60, 65)
-    rect = window.create_rectangle(c1, c2)
-
-    end = c1 + Direction.RIGHT * 50
-    end2 = end + Direction.DOWN * 50
-    end3 = end2 + (Direction.UP + Direction.LEFT) * 50
-
-    animation = Motion(window, rect, (end, end2, end3), speed=1)
-
-    window.add_motion(animation)
-    window.add_event('<B1-Motion>')
-
-    root.mainloop()
-    ```
-    """
-    canvas: tk.Canvas
-    id: int
-    endpoints: Tuple[Coord]
-
-    speed: int = 1
-
-    def start(self) -> Generator[Callable]:
-        """
-        The entry point for generating move commands.
-        """
-        move = partial(self.canvas.move, self.id)
-
-        def frame(increment: Coord, count: int):
-            for _ in range(count):
-                move(*increment)
-                self.canvas.master.update_idletasks()
-
-        for end in self.endpoints:
-            start = Coord(*self.canvas.coords(self.id)[:2])
-            steps = round(start.distance(end) / self.speed)
-            frames = round(steps / self.speed)
-            increment = (end - start) / steps
-
-            for _ in range(frames):
-                yield partial(frame, increment, round(steps / frames))
-
-    def __iter__(self):
-        return self.start()
-
-    def __key(self):
-        return self.id
-
-    def __hash__(self):
-        return hash(self.__key())
-
-    def __eq__(self):
-        return isinstance(self, type(other)) and self.__key() == other.__key()