More due changes

renpy/atl.py

@@ -129,7 +129,6 @@ def interpolate_spline(t, spline, typ):
         return spline[-1]
 
     if typ in (position, position.from_any) and renpy.config.mixed_position:
-        typ = position.from_any
         spline = [position.from_any(i) for i in spline]
 
     lenspline = len(spline)
@@ -182,8 +181,6 @@ def interpolate_spline(t, spline, typ):
     if rv is None:
         return None
 
-    if typ is position.from_any:
-        return position.from_any(rv)
     return type(spline[-1])(rv)
 
 
@@ -1446,7 +1443,7 @@ def execute(self, trans, st, state, events):
 
         if radii is not None:
             startradius, endradius = radii
-            trans.state.radius = interpolate(complete, startradius, endradius, position)
+            trans.state.radius = interpolate(complete, startradius, endradius, position.from_any)
 
         if anchorangles is not None:
             startangle, endangle = anchorangles[:2]
@@ -1456,7 +1453,7 @@ def execute(self, trans, st, state, events):
 
         if anchorradii is not None:
             startradius, endradius = anchorradii
-            trans.state.anchorradius = interpolate(complete, startradius, endradius, position)
+            trans.state.anchorradius = interpolate(complete, startradius, endradius, position.from_any)
 
 
 

renpy/display/__init__.py

@@ -105,5 +105,6 @@ def get_info():
     from . import transform
     from . import transition
     from . import tts
+    from . import types
     from . import video
     from . import viewport

renpy/display/displayable.py

@@ -42,7 +42,7 @@ def place(width, height, sw, sh, placement):
     """
 
     xpos, ypos, xanchor, yanchor, xoffset, yoffset, _subpixel = placement
-    compute_raw = renpy.types.absolute.compute_raw
+    compute_raw = renpy.display.types.absolute.compute_raw
 
     if xpos is None:
         xpos = 0

renpy/display/motion.py

@@ -31,6 +31,7 @@
 import renpy
 from renpy.display.render import render
 from renpy.display.layout import Container
+from renpy.display.types import absolute, position
 
 # Some imports are here to handle pickles of a moved class.
 from renpy.display.transform import Transform, Proxy, TransformState, ATLTransform, null  # @UnusedImport
@@ -211,7 +212,7 @@ def __init__(self, start, end):
 
     def __call__(self, t, sizes=(None, None, None, None)):
 
-        return renpy.atl.interpolate(t, tuple(self.start), tuple(self.end), renpy.types.position)
+        return renpy.atl.interpolate(t, tuple(self.start), tuple(self.end), position.from_any)
 
 
 def Pan(startpos, endpos, time, child=None, repeat=False, bounce=False,
@@ -318,8 +319,6 @@ def __init__(self, start, end, child, around=(0.5, 0.5), cor=(0.5, 0.5), pos=Non
         self.child = child
 
     def __call__(self, t, rect):
-        absolute = renpy.types.absolute
-
         (w, h, cw, ch) = rect
 
         # Converts a float to an integer in the given range, passes

renpy/display/movetransition.py

@@ -30,6 +30,7 @@
 
 
 import renpy
+from renpy.display.types import absolute
 
 # Utility function used by MoveTransition et al.
 def position(d):
@@ -402,8 +403,6 @@ def child_placement(self, child):
         (except subpixel which is boolean)
         """
 
-        absolute = renpy.types.absolute
-
         def based(v, base):
             if v is None:
                 return 0
@@ -429,8 +428,6 @@ def get_placement(self):
         if self.time_warp is not None:
             done = self.time_warp(done)
 
-        absolute = renpy.types.absolute
-
         def I(a, b):
             return absolute(a + done * (b - a))
 

renpy/display/particle.py

@@ -86,8 +86,8 @@ class Sprite(renpy.object.Object):
     The methods of a Sprite object are:
         """
 
-    x = 0 # type: int|float|renpy.types.absolute
-    y = 0 # type: int|float|renpy.types.absolute
+    x = 0 # type: int|float|renpy.display.types.absolute
+    y = 0 # type: int|float|renpy.display.types.absolute
     zorder = 0 # type: int|float
 
 

renpy/display/render.pyx

@@ -227,10 +227,10 @@ cpdef render(d, object widtho, object heighto, double st, double at):
         width, height = d._offer_size
 
     if xmaximum is not None:
-        width = min(renpy.types.absolute.compute_raw(xmaximum, width), width)
+        width = min(renpy.display.types.absolute.compute_raw(xmaximum, width), width)
 
     if ymaximum is not None:
-        height = min(renpy.types.absolute.compute_raw(ymaximum, height), height)
+        height = min(renpy.display.types.absolute.compute_raw(ymaximum, height), height)
 
     if width < 0:
         width = 0
@@ -857,8 +857,8 @@ cdef class Render:
 
         (xo, yo) = pos
 
-        xo = renpy.types.absolute(xo)
-        yo = renpy.types.absolute(yo)
+        xo = renpy.display.types.absolute(xo)
+        yo = renpy.display.types.absolute(yo)
 
         if index is None:
             self.children.append((source, xo, yo, focus, main))

renpy/text/text.py

@@ -957,7 +957,7 @@ def scale_int(self, n):
         if n is None:
             return n
 
-        if isinstance(n, renpy.types.absolute):
+        if isinstance(n, renpy.display.types.absolute):
             return int(n)
 
         return round(n * self.oversample)
@@ -966,7 +966,7 @@ def scale_outline(self, n):
         if n is None:
             return n
 
-        if isinstance(n, renpy.types.absolute):
+        if isinstance(n, renpy.display.types.absolute):
             return int(n)
 
         if self.outline_step: