Merge branch 'master' into lighthouse

# Conflicts:
#	topics/numerals.py
This commit is contained in:
Ben Hambrecht
2018-01-24 18:50:44 +01:00
parent ea18d984ce
commit a4a146a54e
5 changed files with 75 additions and 35 deletions

View File

@ -172,18 +172,12 @@ class AnnularSector(VMobject):
arc_center = first_point - self.inner_radius * radial_unit_vector
return arc_center
<<<<<<< HEAD
def move_arc_center_to(self,point):
v = point - self.get_arc_center()
self.shift(v)
return self
=======
>>>>>>> master
class Sector(AnnularSector):
CONFIG = {
"outer_radius" : 1,
"inner_radius" : 0