Merge branch 'master' of github.com:3b1b/manim

This commit is contained in:
Grant Sanderson 2021-02-11 19:31:16 -08:00
commit 96d9a66faf

View file

@ -70,15 +70,9 @@ Next, let's take a detailed look at what each row does.
**Line 1**: **Line 1**:
.. code-block:: python .. code-block:: python
<<<<<<< HEAD
from manimlib.imports import *
=======
from manimlib import * from manimlib import *
>>>>>>> TonyCrane-package-improve
This will import all the classes that may be used when using manim. This will import all the classes that may be used when using manim.
**Line 3**: **Line 3**:
@ -215,11 +209,7 @@ at the end of the code to enable interaction:
self.embed() self.embed()
<<<<<<< HEAD
Then run ``python manim.py start.py SquareToCircle``.
=======
Then run ``manimgl start.py SquareToCircle``. Then run ``manimgl start.py SquareToCircle``.
>>>>>>> TonyCrane-package-improve
After the previous animation is executed, the ipython terminal will be opened on After the previous animation is executed, the ipython terminal will be opened on
the command line. After that, you can continue to write code in it, and the statement the command line. After that, you can continue to write code in it, and the statement