public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-09-19 04:41:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Final merge conflict cleanup

Browse source
This commit is contained in:
Grant Sanderson 2018-01-23 12:23:29 -08:00
parent f6c9c6eec6
commit 47c41139bf
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scene/scene.py
View file

@ -482,6 +482,11 @@ class Scene(object):
def preview(self):
TkSceneRoot(self)
def save_image(self, name = None, mode = "RGB", dont_update = False):
folder = "images"
if dont_update:
folder = str(self)
def get_image_file_path(self, name = None, dont_update = False):
folder = "images"

5
topics/geometry.py
View file

@ -172,16 +172,11 @@ 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 = {