Add orientation to VMobject, shoelace, ArcPolygon, Tiling, Graph #210

XorUnison · 2020-07-21T13:43:46Z

~~Added shoelace method to space_ops.py~~
~~Added orientation methods to vectorized_mobject.py, uses shoelace~~
Added ~~ArcPolygon~~, Tiling and ~~Graph~~ to geometry.py
Added Honeycomb to three_dimensions.py
~~Added BraceBetweenPoints to brace.py~~

The code I used for testing the new additions:

class Test1(ZoomedScene):# Orientation
    CONFIG = {
        "zoomed_camera_frame_starting_position": [0,0,0],
        "zoomed_display_corner": [0,0,0],
        "zoomed_display_height": config['frame_height'],
        "zoomed_display_width": config['frame_width'],
        "zoom_factor": 0.5,
    }   
    def construct(self):
        self.activate_zooming(animate=False)
        pol1=RegularPolygon(5)
        pol2=RegularPolygon(5).force_direction("CW")
        pol3=RegularPolygon(5).reverse_direction()
        pol4=RegularPolygon(5).reverse_direction().reverse_direction()
        pol5=RegularPolygon(5).force_direction("CW").reverse_direction()
        self.play(ShowCreation(pol1))
        self.remove(pol1)
        self.play(ShowCreation(pol2))
        self.remove(pol2)
        self.play(ShowCreation(pol3))
        self.remove(pol3)
        self.play(ShowCreation(pol4))
        self.remove(pol4)
        self.play(ShowCreation(pol5))
        self.wait(1)

class Test2(Scene):# ArcPolygon
    def construct(self):
        r3 = math.sqrt(3)
        arc_config = {"stroke_width":3,"stroke_color":RED,
                      "fill_opacity":0.5,"color": GREEN}
        pol_config = {"stroke_width":10,"stroke_color":BLUE,
                      "fill_opacity":1,"color": PURPLE}
        arc0=ArcBetweenPoints(np.array([-1,0,0]),
                              np.array([1,0,0]),radius=2,**arc_config)
        arc1=ArcBetweenPoints(np.array([1,0,0]),
                              np.array([0,r3,0]),radius=2,**arc_config)
        arc2=ArcBetweenPoints(np.array([0,r3,0]),
                              np.array([-1,0,0]),radius=2,**arc_config)
        reuleaux_triangle=ArcPolygon(arc0,arc1,arc2,**pol_config)
        self.play(Write(reuleaux_triangle))
        self.wait(2)

class Test3(Scene):# Tiling
    def construct(self):
        test=Tiling(Square(),
                    [[Mobject.shift,[2.1,0,0]]],
                    [[Mobject.shift,[0,2.1,0]]],
                    range(-1,1),
                    range(-1,1))
        self.play(Write(test))
        self.play(FadeOut(test.tile_dictionary[1][-1]))
        self.wait(2)

class Test4(ZoomedScene):# Graph
    CONFIG = {
        "zoomed_camera_frame_starting_position": [0,0,0],
        "zoomed_display_corner": [0,0,0],
        "zoomed_display_height": config['frame_height'],
        "zoomed_display_width": config['frame_width'],
        "zoom_factor": 0.5,
    }   
    def construct(self):
        self.activate_zooming(animate=False)
        g = {0: [[0,0,0], [1, 2], {"color": BLUE}],
             1: [[1,0,0], [0, 2], {"color": GRAY}],
             2: [[0,1,0], [0, 1], {"color": PINK}]}
        K3 = Graph(g,vertex_config={"radius": 0.2,"fill_opacity": 1},
                   edge_config={"stroke_width": 5,"color": RED})
        K3v = K3.vertices
        K3e = K3.edges
        self.play(ShowCreation(K3e),ShowCreation(K3v))
        self.wait(2)
        self.remove(K3e,K3v)
        
        g = {0: [[0,0,0], [[1,{"angle": 2}], [2,{"color": WHITE}]], {"color": BLUE}],
             1: [[1,0,0], [0, 2], {"color": GRAY}],
             2: [[0,1,0], [0, 1], {"color": PINK}]}
        K3 = Graph(g,vertex_config={"radius": 0.2,"fill_opacity": 1},
                   edge_config={"stroke_width": 5,"color": RED})
        K3v = K3.vertices
        K3e = K3.edges
        self.play(ShowCreation(K3e),ShowCreation(K3v))
        self.wait(2)

class Test5(Scene):# BraceBetweeenPoints
    def construct(self):
        bbp=BraceBetweeenPoints([-1,0,0],[1,0,0])
        self.play(Write(bbp))
        self.wait(2)

Pretty self-explanatory.

class Test6(ThreeDScene):# Honeycomb
    def construct(self):
        self.set_camera_orientation(0.6, -0.7853981, 86.6)
        self.begin_ambient_camera_rotation()
        
        test=Honeycomb(Cube(stroke_width=5,stroke_color=BLUE,
                            fill_opacity=0.3,fill_color=PURPLE),
                    [[Mobject.shift,[2.1,0,0]]],
                    [[Mobject.shift,[0,2.1,0]]],
                    [[Mobject.shift,[0,0,2.1]]],
                    range(-1,1),
                    range(-1,1),
                    range(-1,1))
        self.play(Write(test))
        self.wait(2)
        self.play(FadeOut(test.cell_dictionary[1][-1][1]))
        self.wait(2)
        self.move_camera(0.8*np.pi/2, -0.45*np.pi)
        self.wait(2)

Added shoelace method to space_ops.py Added orientation methods to vectorized_mobject.py, uses shoelace Added ArcPolygon, Tiling and Graph to geometry.py

huguesdevimeux · 2020-07-24T14:38:26Z

Could you write a test of this PR ? Refer to the wiki to see the instructions.

And just a request, could you add a visual of your changes ? like an image, or a gif. It would be easier for all of us to see and understand what you did. Thank you in advance !

XorUnison · 2020-07-24T14:46:38Z

Could you write a test of this PR ? Refer to the wiki to see the instructions.

And just a request, could you add a visual of your changes ? like an image, or a gif. It would be easier for all of us to see and understand what you did. Thank you in advance !

Sure I guess, but I'll have to work myself into the testing architecture. From the looks of it... I have to mostly add scenes to test_geometry.py. Also I just realized I wanted to add another obvious feature, BraceBetweenPoints, so there's that too.

huguesdevimeux · 2020-07-24T14:48:19Z

Sure I guess, but I'll have to work myself into the testing architecture. From the looks of it... I have to mostly add scenes to test_geometry.py. Also I just realized I wanted to add another obvious feature, BraceBetweenPoints, so there's that too.

Yes, in theory you only have to touch test_geometry.py.

XorUnison · 2020-07-24T14:49:52Z

Yes, in theory you only have to touch test_geometry.py.

But I'd wager tests should also test some consistency on applying colors etc... but I see nothing like this in the tests, nor in the wiki. Do we have any policy on that?

XorUnison · 2020-07-26T15:04:24Z

Alright. BraceBetweenPoints has been added, tests for the 3 new geometry classes have been added, and the OP now contains gifs of the orientation methods and the 3 new geometry classes.

Aathish04

I think I'm speaking for @PgBiel here, but I think that it would be extremely useful if you could add numpy style docstrings to the objects and methods that you have added.

Having the detailed breakdown of instantiating each object (like you've done now) is really well done and detailed, but having docstrings for each and every method would be extremely useful when using an IDE.

XorUnison · 2020-07-30T05:38:29Z

I think I'm speaking for @PgBiel here, but I think that it would be extremely useful if you could add numpy style docstrings to the objects and methods that you have added.

Having the detailed breakdown of instantiating each object (like you've done now) is really well done and detailed, but having docstrings for each and every method would be extremely useful when using an IDE.

Noted. I'll have a look at that. Shouldn't be too hard to add considering it's not that many new objects/methods. And there's not really such a thing as too verbose comments.

XorUnison · 2020-07-31T11:43:01Z

Alright I've added yet more verbose docstrings, fixed a few formatting issues I made myself and also added Honeycomb, which basically just Tiling in 3D.

There's some beef with the new formatting though, it's not giving me logs, and the local black installation was unwilling to check the files I tried to use it on, instead opting to complain about being unable to import stuff, so if there's something specific you need on the formatting someone else is gonna have to tell me what and how.

XorUnison · 2020-07-31T11:45:00Z

Suggestion: Maybe rename this to GraphTheoryGraph or GraphGT or something like that, because this is most certainly going to be confusing to newcomers.

I've been thinking about this but neither of these seem like great ideas either. I'll probably think about this some more since this isn't gonna get merged today anyway.

Edit: Maybe something like:
EdgeVertexGraph?
VertexGraph?

huguesdevimeux · 2020-07-31T13:28:20Z

Suggestion: Maybe rename this to GraphTheoryGraph or GraphGT or something like that, because this is most certainly going to be confusing to newcomers.

I've been thinking about this but neither of these seem like great ideas either. I'll probably think about this some more since this isn't gonna get merged today anyway.

Edit: Maybe something like:
EdgeVertexGraph?
VertexGraph?

EdgeVertex Graph looks good to me.

Pinging Captain Docs @PgBiel to check the docstrings (if he has time, of course)

Aathish04 · 2020-07-31T16:02:27Z

@XorUnison I ran your branch through black and there were about 10 files that needed reformatting, these were reformatted and that's what my commit is.

There's some beef with the new formatting though, it's not giving me logs, and the local black installation was unwilling to check the files I tried to use it on, instead opting to complain about being unable to import stuff, so if there's something specific you need on the formatting someone else is gonna have to tell me what and how.

…eenPoints

XorUnison · 2020-07-31T21:00:42Z

EdgeVertex Graph looks good to me.

EdgeVertexGraph seems a bit clunky, but it's definitely much clearer than Graph while being less clunky than GraphTheoryGraph. I adjusted it.

@XorUnison I ran your branch through black and there were about 10 files that needed reformatting, these were reformatted and that's what my commit is.

Noted and appreciated, but a bunch of those files weren't even touched by me. Probably jankyness from the switch.

Although I also figured out along with this commit that Black ignores the very first standard outlined in PEP8 and pretends it doesn't exist, opening delimiter alignment, which also made Black instantly die as a serious PEP8 autoformatter in my eyes. Thanks to that it made some changes that are technically still okay within PEP8, but positively hideous ones that aren't really in alignment with the underlying intent of PEP8 either. I mean ignoring the very first standard of PEP8...?
I'm not saying we should dig it up again and look for a better autoformatter but Black? Yeah... wasn't a good choice at all. We dun goofed on that one.

manim/mobject/geometry.py

manim/mobject/three_dimensions.py

manim/mobject/types/vectorized_mobject.py

manim/utils/space_ops.py

leotrs · 2020-08-15T13:06:35Z

What's the status of this PR? Can we get an update please? :) I believe I saw some discussion about this on Discord.

XorUnison · 2020-08-15T13:40:41Z

What's the status of this PR? Can we get an update please? :) I believe I saw some discussion about this on Discord.

Still working through all the requested changes. The only one that's currently left is a suggestion by EulerTour on how to handle the functions applied to the tiles. His suggestion is a bit more complicated for the simplest scenarios, but it is more flexible and pythonic in total, and also deals better with more complicated scenarios. So I aim to digest it and switch up the way Tiling works again, since it's supposed to be as good as possible upon merging after all. Once that's done I have to fix all the conflicts piling up and then it'll be ready for review again.

PgBiel

see the docs guidelines in the wiki for more info

PgBiel · 2020-08-20T04:13:41Z

manim/mobject/geometry.py

+
+    Parameters
+    ----------
+    *arcs : Arc or ArcBetweenPoints


doc fixes

Suggested change

*arcs : Arc or ArcBetweenPoints

arcs : Union[:class:`Arc`, :class:`ArcBetweenPoints`]

PgBiel · 2020-08-20T04:14:27Z

manim/mobject/geometry.py

+
+    Example
+    -------
+    ArcPolygon(arc0,arc1,arc2,arcN,**kwargs)


so that sphinx displays it properly

Suggested change

ArcPolygon(arc0,arc1,arc2,arcN,**kwargs)

::

ArcPolygon(arc0,arc1,arc2,arcN,**kwargs)

manim/mobject/geometry.py

PgBiel · 2020-08-20T04:15:23Z

manim/mobject/geometry.py

+    ArcPolygon also doubles as a group for the input arcs.
+    That means these arcs can be drawn and seen separately.
+    If only the ArcPolygon itself is supposed to be visible,
+    make the arcs invisible (for example with "stroke_width": 0).
+    ArcPolygon.arcs can be used get values from these subarcs.


this shouldn't be under Examples but in description itself

PgBiel · 2020-08-20T04:15:50Z

manim/mobject/geometry.py

+class ArcPolygon(VMobject):
+    """
+    The ArcPolygon is what it says, a polygon, but made from arcs.
+    More versatile than the standard Polygon.


just so it links to the class for quick access

Suggested change

More versatile than the standard Polygon.

More versatile than the standard :class:`Polygon`.

PgBiel · 2020-08-20T04:41:20Z

manim/mobject/geometry.py

+        """
+        This method computes and applies the offsets for the tiles,
+        in the given dimension.
+        multiplies inputs, which requires arrays to be numpy arrays.


docs of parameters

PgBiel · 2020-08-20T04:41:51Z

manim/mobject/geometry.py

+    The tile prototype can be any Mobject (also groups) or a function.
+    The function format is function(x,y), returning a Mobject.
+    Using groups or functions allows the tiling to contain multiple
+    different tiles or to simplify the following offset functions.


should be moved to tile_prototype short desc

PgBiel · 2020-08-20T04:42:10Z

manim/mobject/geometry.py

+    Next are two nested lists that determine how the tiles are arranged.
+    The functions are typically Mobject.shift and Mobject.rotate.
+    Each list has to contain sublists with Function/Value pairs.
+    More on this in the Examples section.


should be moved to the offset short descs

PgBiel · 2020-08-20T04:42:27Z

manim/mobject/geometry.py

+    Last are two ranges: If both ranges are range(-1,1,1),
+    that would result in a square grid of 9 tiles.


should be moved to range short descs

manim/mobject/geometry.py

Co-authored-by: Pg Biel <9021226+PgBiel@users.noreply.github.com>

The final edits before the changes in here are spread into multiple new and fresh PRs

…/manim into GeometryAdditions

leotrs · 2020-10-08T21:37:44Z

Hi @XorUnison do you have any updates on this branch? :)

leotrs · 2020-10-25T19:13:43Z

There hasn't been any movement here for over two months, and by now it will be highly non-trivial to deal with the merge conflicts here. I vote we close this :(

Committing suggestions to use in new branch Co-authored-by: Pg Biel <9021226+PgBiel@users.noreply.github.com>

Initial Commit

e8445ea

Added shoelace method to space_ops.py Added orientation methods to vectorized_mobject.py, uses shoelace Added ArcPolygon, Tiling and Graph to geometry.py

XorUnison linked an issue Jul 21, 2020 that may be closed by this pull request

Adding orientation to Mobject #187

Closed

Aathish04 changed the title ~~Initial Commit~~ Add orientation to Mobject Jul 21, 2020

XorUnison changed the title ~~Add orientation to Mobject~~ Add orientation to VMobject, shoelace, ArcPolygon, Tiling, Graph Jul 22, 2020

Added BraceBetweenPoints, adjusted tests

79b4d54

XorUnison added the new feature Enhancement specifically adding a new feature (feature request should be used for issues instead) label Jul 26, 2020

Aathish04 requested changes Jul 30, 2020

View reviewed changes

XorUnison and others added 2 commits July 31, 2020 13:27

Added Honeycomb, even more verbose docstrings, fixed Tiling variables

79a5f77

Merge branch 'master' into GeometryAdditions

39498e1

Format with Black

4b1f82a

More format fixes, removed deprecated np.array attributes for ArcBetw…

2940813

…eenPoints

eulertour requested changes Aug 3, 2020

View reviewed changes

XorUnison mentioned this pull request Aug 5, 2020

Modifying the font weight or font face after a Text type object is created. #250

Closed

XorUnison mentioned this pull request Aug 15, 2020

Makes windows build faster, by using a prebuild Latex from TinyTex CI and avoid using Choco #277

Merged

PgBiel requested changes Aug 20, 2020

View reviewed changes

huguesdevimeux marked this pull request as draft August 27, 2020 21:37

Simplify arc-check

8958b29

Co-authored-by: Pg Biel <9021226+PgBiel@users.noreply.github.com>

XorUnison and others added 3 commits September 4, 2020 12:51

Docstring fix

2fd454b

Co-authored-by: Pg Biel <9021226+PgBiel@users.noreply.github.com>

Final edits

7557c55

The final edits before the changes in here are spread into multiple new and fresh PRs

Merge branch 'GeometryAdditions' of https://github.com/ManimCommunity…

564815c

…/manim into GeometryAdditions

XorUnison and others added 3 commits October 30, 2020 00:47

Update manim/mobject/types/vectorized_mobject.py

798c1d7

Committing suggestions to use in new branch Co-authored-by: Pg Biel <9021226+PgBiel@users.noreply.github.com>

Update manim/mobject/types/vectorized_mobject.py

dcdbce9

Committing suggestions to use in new branch Co-authored-by: Pg Biel <9021226+PgBiel@users.noreply.github.com>

Apply suggestions from code review

ddc566b

Committing suggestions to use in new branch Co-authored-by: Pg Biel <9021226+PgBiel@users.noreply.github.com>

XorUnison mentioned this pull request Oct 31, 2020

Direction methods (VMobject) #647

Merged

This was referenced Nov 10, 2020

Added BraceBetweenPoints and some documentation #693

Merged

Add ArcPolygon to geometry.py #707

Merged

XorUnison closed this Dec 1, 2020

eulertour deleted the GeometryAdditions branch December 2, 2020 05:07

behackl mentioned this pull request Dec 17, 2020

Basic implementation of undirected graphs #861

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add orientation to VMobject, shoelace, ArcPolygon, Tiling, Graph #210

Add orientation to VMobject, shoelace, ArcPolygon, Tiling, Graph #210

XorUnison commented Jul 21, 2020 •

edited

Loading

huguesdevimeux commented Jul 24, 2020 •

edited

Loading

XorUnison commented Jul 24, 2020

huguesdevimeux commented Jul 24, 2020

XorUnison commented Jul 24, 2020

XorUnison commented Jul 26, 2020

Aathish04 left a comment

XorUnison commented Jul 30, 2020

XorUnison commented Jul 31, 2020

XorUnison commented Jul 31, 2020 •

edited

Loading

huguesdevimeux commented Jul 31, 2020

Aathish04 commented Jul 31, 2020 •

edited

Loading

XorUnison commented Jul 31, 2020

leotrs commented Aug 15, 2020

XorUnison commented Aug 15, 2020 •

edited

Loading

PgBiel left a comment

PgBiel Aug 20, 2020

PgBiel Aug 20, 2020

PgBiel Aug 20, 2020

PgBiel Aug 20, 2020

PgBiel Aug 20, 2020

PgBiel Aug 20, 2020

PgBiel Aug 20, 2020

PgBiel Aug 20, 2020

leotrs commented Oct 8, 2020

leotrs commented Oct 25, 2020

	*arcs : Arc or ArcBetweenPoints
	arcs : Union[:class:`Arc`, :class:`ArcBetweenPoints`]

	More versatile than the standard Polygon.
	More versatile than the standard :class:`Polygon`.

		Last are two ranges: If both ranges are range(-1,1,1),
		that would result in a square grid of 9 tiles.

Add orientation to VMobject, shoelace, ArcPolygon, Tiling, Graph #210

Add orientation to VMobject, shoelace, ArcPolygon, Tiling, Graph #210

Conversation

XorUnison commented Jul 21, 2020 • edited Loading

huguesdevimeux commented Jul 24, 2020 • edited Loading

XorUnison commented Jul 24, 2020

huguesdevimeux commented Jul 24, 2020

XorUnison commented Jul 24, 2020

XorUnison commented Jul 26, 2020

Aathish04 left a comment

Choose a reason for hiding this comment

XorUnison commented Jul 30, 2020

XorUnison commented Jul 31, 2020

XorUnison commented Jul 31, 2020 • edited Loading

huguesdevimeux commented Jul 31, 2020

Aathish04 commented Jul 31, 2020 • edited Loading

XorUnison commented Jul 31, 2020

leotrs commented Aug 15, 2020

XorUnison commented Aug 15, 2020 • edited Loading

PgBiel left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leotrs commented Oct 8, 2020

leotrs commented Oct 25, 2020

XorUnison commented Jul 21, 2020 •

edited

Loading

huguesdevimeux commented Jul 24, 2020 •

edited

Loading

XorUnison commented Jul 31, 2020 •

edited

Loading

Aathish04 commented Jul 31, 2020 •

edited

Loading

XorUnison commented Aug 15, 2020 •

edited

Loading