From 01ef5fc2c7de7e8bb4e03708b97054522f910684 Mon Sep 17 00:00:00 2001 From: Grant Sanderson Date: Sun, 1 Apr 2018 10:51:54 -0700 Subject: [PATCH] Several import fixes --- camera/three_d_camera.py | 2 ++ mobject/geometry.py | 7 ++++++- mobject/matrix.py | 2 ++ mobject/probability.py | 2 ++ mobject/three_dimensions.py | 6 ++++-- once_useful_constructs/light.py | 1 + scene/three_d_scene.py | 3 ++- scene/vector_space_scene.py | 2 ++ utils/color.py | 4 ++-- 9 files changed, 23 insertions(+), 6 deletions(-) diff --git a/camera/three_d_camera.py b/camera/three_d_camera.py index a60fc953..8054bef9 100644 --- a/camera/three_d_camera.py +++ b/camera/three_d_camera.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import numpy as np from constants import * diff --git a/mobject/geometry.py b/mobject/geometry.py index a2182d5b..a39c0056 100644 --- a/mobject/geometry.py +++ b/mobject/geometry.py @@ -631,7 +631,12 @@ class Vector(Arrow): class DoubleArrow(Arrow): def init_tip(self): - self.tip = [(self.add_tip(), True), (self.add_tip(add_at_end = False), False)] + self.tip = VGroup() + for b in True, False: + t = self.add_tip(add_at_end = b) + t.add_at_end = b + self.tip.add(t) + self.tip.match_style(self.tip[0]) class CubicBezier(VMobject): def __init__(self, points, **kwargs): diff --git a/mobject/matrix.py b/mobject/matrix.py index 279a076c..cf20f6de 100644 --- a/mobject/matrix.py +++ b/mobject/matrix.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import numpy as np from mobject.mobject import Mobject diff --git a/mobject/probability.py b/mobject/probability.py index 5be9f1de..d4a1ef93 100644 --- a/mobject/probability.py +++ b/mobject/probability.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + from constants import * from mobject.mobject import Mobject diff --git a/mobject/three_dimensions.py b/mobject/three_dimensions.py index 1aabbd62..29b13716 100644 --- a/mobject/three_dimensions.py +++ b/mobject/three_dimensions.py @@ -1,7 +1,9 @@ +from __future__ import absolute_import + from constants import * -from mobject.vectorized_mobject import VMobject -from topics.geometry import Square +from mobject.types.vectorized_mobject import VMobject +from mobject.geometry import Square from utils.space_ops import z_to_vector diff --git a/once_useful_constructs/light.py b/once_useful_constructs/light.py index 41af1beb..b5462630 100644 --- a/once_useful_constructs/light.py +++ b/once_useful_constructs/light.py @@ -2,6 +2,7 @@ from constants import * from mobject.geometry import AnnularSector from mobject.geometry import Arc +from mobject.geometry import Annulus from mobject.mobject import Mobject from mobject.svg.svg_mobject import SVGMobject from mobject.svg.tex_mobject import TexMobject diff --git a/scene/three_d_scene.py b/scene/three_d_scene.py index 884bc521..6896e55f 100644 --- a/scene/three_d_scene.py +++ b/scene/three_d_scene.py @@ -1,10 +1,11 @@ +from __future__ import absolute_import from constants import * from continual_animation.continual_animation import ContinualMovement from animation.transform import ApplyMethod from camera.three_d_camera import ThreeDCamera -from mobject.vectorized_mobject import VGroup +from mobject.types.vectorized_mobject import VGroup from mobject.three_dimensions import should_shade_in_3d from scene.scene import Scene diff --git a/scene/vector_space_scene.py b/scene/vector_space_scene.py index a98080b6..157561e1 100644 --- a/scene/vector_space_scene.py +++ b/scene/vector_space_scene.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import numpy as np from constants import * diff --git a/utils/color.py b/utils/color.py index 77e4a62a..a4e11082 100644 --- a/utils/color.py +++ b/utils/color.py @@ -2,8 +2,8 @@ import numpy as np import random from colour import Color -from colour import WHITE -from colour import PALETTE +from constants import WHITE +from constants import PALETTE from utils.bezier import interpolate