Morphs and Partially draw Objects #482

ArbitRandomUser · 2022-05-13T11:07:19Z

Did I update CHANGELOG.md with whatever changes/features I added with this PR?
Did I make sure to only change the part of the file where I introduced a new change/feature?
Did I cover all corner cases to be close to 100% test coverage (if applicable)?
Did I properly add Javis dependencies to the Project.toml + set an upper bound of the dependency (if applicable)?
Did I properly add test dependencies to the test directory (if applicable)?
Did I check relevant tutorials that may be affected by changes in this PR?
Did I clearly articulate why this PR was made the way it was and how it was made?

How did you address these issues with this PR? What methods did you use?

Install master branch Luxor.jl branch till Luxor 3.5 is released if you want to try out this PR

PR allows Arbitrary morphs from any Object to Object , Object to Function .
and also keyframed morphs with Animations.jl .
PR also brings in ability to draw Objects partially , and "show-creation" (and destruction) of objects.

This is made possible with the help of JPath a structure holding data of polygons and how to fill and stroke them.
Every Javis Object now has a a jpaths field an array for JPath that is got from evaluating the object.func fo the Object

Extracting the polygons is made possible by over-riding luxors strokepath/stroke/fillpath/fillpreserve methods . These four methods are only ways to lay the current path onto the canvas and all of luxors "drawing function" eventually call one or more of these four. (except for text ).

Morphs between polygons are using a modified version of luxors polymorph. (modified so that
polys dont have to be resampled everytime its called)

Limitations:
afaik...

Cannot be used in conjunction with sethue in Actions. Morphs will work , but the sethue will not
if you want to change hue while morphing you will have to change the hue of the target you are morphing to.
Objects and Functions which have clipping regions in their drawings will not be morphed properly.
Gets the morphs done .. ~~but might not be the most "natural" or simplest morph possible.~~ morphs are somewhat "natural" now by offseting the index for best match between two polygons. But individual polygons are not matched for the shortest transformation
dashed lines not yet implemented . Objects should use only solid lines
strokescale doesnt change during morph (not yet implemented) . Objects should have the default strokethickness

Examples for Morphs:

`Object` to `Object` morphs ...

using Javis

video = Video(500,500)
nframes = 160 

function circdraw(colo)
    sethue(colo)
    setopacity(0.5)
    circle(O,100,:fillpreserve)
    setopacity(1.0)
    sethue("white")
    strokepath()
end

function boxdraw(colo)
    sethue(colo)
    box(O,100,100,:fillpreserve)
    setopacity(1.0)
    sethue("white")
    strokepath()
end

Background(1:nframes,(args...)->background("black"))
boxobj  = Object((v,o,f) -> boxdraw("green"))
circobj = Object((v,o,f) -> circdraw("red"))

transform_to_box = Action(20:nframes-20, morph_to(boxobj))
act!(circobj, transform_to_box)
render(video,pathname="circ_to_box.gif")

`Object` to `Function` morphs ...

Background(1:nframes,(args...)->background("black"))
circobj = Object(1:nframes,(args...) -> circdraw("red"))

transform_to_box = Action(20:nframes-20, morph_to(boxdraw,["blue"]))
act!(circobj, transform_to_box)

render(video,pathname="circ_to_box_fn.gif")

Keyframed morphs using Animations.jl

using Javis
using Animations
video = Video(500,500)
nframes = 160 

function circdraw(colo)
    sethue(colo)
    setopacity(0.5)
    circle(O,50,:fillpreserve)
    setopacity(1.0)
    sethue("white")
    strokepath()
end

function boxdraw(colo)
    sethue(colo)
    box(O,100,100,:fillpreserve)
    setopacity(1.0)
    sethue("white")
    strokepath()
end

function stardraw()
    sethue("white")
    star(O,100,5,0.5,0.0,:stroke)
end

Background(1:nframes+10,(args...)->background("black"))
boxobj = Object(1:nframes+10 , (args...) -> boxdraw("green") )
anim = Animation([0, 0.7, 1],  MorphFunction[(boxdraw, ["green"]),
                                             (stardraw, []),
                                             (circdraw, ["red"])
                                             ])


action = Action(1:nframes,anim,morph())
act!(boxobj,action)
render(video,pathname="box_to_star_to_circ.gif")

Examples for Partial Draw .

using Javis
video = Video(500,500)
nframes = 360 

function ground()
    background("black")
    sethue("white")
end

function boxdraw(colo)
    circle(O+100,50,:stroke)
    sethue(colo)
    box(O,100,100,:fillpreserve)
    setopacity(1.0)
    sethue("white")
    strokepath()
end

Background(1:nframes+60,(args...)->ground())
boxobj = Object(1:nframes+60 , (args...) -> boxdraw("green") )

action_create = Action(1:nframes÷2,sineio(),Javis.showcreation())
action_remove = Action(nframes÷2+30:nframes,sineio(),Javis.showdestruction())
act!(boxobj,action_create)
act!(boxobj,action_remove)
render(video,tempdirectory="images",pathname="show_box_creation.gif")
run(`mpv show_box_creation.gif`)

…e, also introduces new pathtopoly

… written

codecov-commenter · 2022-05-13T11:37:25Z

Codecov Report

Merging #482 (974344c) into main (6add2f2) will decrease coverage by 18.75%.
The diff coverage is 88.34%.

@@             Coverage Diff             @@
##             main     #482       +/-   ##
===========================================
- Coverage   96.50%   77.74%   -18.76%     
===========================================
  Files          35       38        +3     
  Lines        1630     1991      +361     
===========================================
- Hits         1573     1548       -25     
- Misses         57      443      +386

Impacted Files	Coverage Δ
src/luxor_overrides.jl	`86.54% <76.13%> (-11.05%)`	⬇️
src/action_animations.jl	`95.80% <81.08%> (-4.20%)`	⬇️
src/partial_draw.jl	`84.90% <84.90%> (ø)`
src/structs/Object.jl	`95.34% <86.66%> (-4.66%)`	⬇️
src/morphs.jl	`38.63% <95.49%> (-57.35%)`	⬇️
src/Javis.jl	`96.92% <100.00%> (-0.04%)`	⬇️
src/luxor_utils.jl	`100.00% <100.00%> (ø)`
src/structs/JPath.jl	`100.00% <100.00%> (ø)`
src/Shape.jl	`0.00% <0.00%> (-97.06%)`	⬇️
... and 2 more

Help us with your feedback. Take ten seconds to tell us how you rate us.

…ons from no export (they should be exported)

…unc with luxor draw disabled

…fferent number of jpaths

…later

Wikunia · 2022-07-27T17:03:51Z

Thanks for the fast response. Perfect looking forward to thread safety as well then ☺️

gpucce · 2022-07-28T12:15:49Z

src/structs/Object.jl

+    empty!(CURRENT_JPATHS)
+    global CURRENT_FETCHPATH_STATE = true
+    global DISABLE_LUXOR_DRAW = true
+    v, o, f = nothing, nothing, nothing


Hi @ArbitRandomUser, can't you pass v, o, f explicitly as arguments to getjpaths instead of defining them as nothing, nothing, nothing? It looks they are always available where getjpaths! is called

Wikunia · 2022-07-28T17:31:01Z

I think we can now set Luxor to 3.5 and run the tests 😄

…DRAW and CURRENT_FETHCPATH_STATE

ArbitRandomUser · 2022-07-29T05:07:22Z

I think we can now set Luxor to 3.5 and run the tests smile

tests failed , it seems theres some clash in the deps.
─restricted by julia compatibility requirements to versions: [0.11.0-0.11.2, 0.12.0, 1.0.0, 1.1.0-1.1.5, 1.2.0, 1.3.0, 1.4.0, 1.5.0, 1.6.0, 1.7.0, 1.8.0, 1.9.0, 1.10.0, 1.11.0, 1.12.0, 2.0.0, 2.1.0, 2.2.0-2.2.1, 2.3.0, 2.4.0, 2.5.0-2.5.1, 2.6.0, 2.7.0, 2.8.0, 2.9.0, 2.10.0, 2.11.0, 2.12.0, 2.13.0, 2.14.0, 2.15.0, 2.16.0, 2.17.0, 2.18.0, 2.19.0, 3.0.0, 3.1.0-3.1.1, 3.2.0] or uninstalled — no versions left.

will this be fixed by bumping the julia version up ?

Wikunia · 2022-07-29T05:59:50Z

Yeah Luxor.jl needs Julia 1.6 now which is fine as it's the LTS

ArbitRandomUser · 2022-07-29T11:06:15Z

@Wikunia that didnt work .

Wikunia · 2022-07-29T11:07:45Z

You need to change it here as well: https://github.com/JuliaAnimators/Javis.jl/blob/main/.github/workflows/ci.yml#L12

Wikunia

Just some minor things but afterwards I would like to merge.
Thanks a lot for your awesome work. Looking forward to use this functionality.

Wikunia · 2022-07-30T10:27:45Z

CHANGELOG.md

@@ -2,7 +2,14 @@

 # PR changes
 - changed render method for mp4 to use ffmpeg directly inplace of VideoIO
-
+- Added jpaths a field in Object that is usefull for morphs and partial drawing


Wikunia · 2022-07-30T10:29:38Z

src/luxor_overrides.jl

+"""
+    _betweenpoly_noresample(loop1,loop2,k; easingfunction = easingflat)
+
+Just like _betweenpoly from Luxor , but expects polygons `loop1` and `oop2` to be of same size , and


Wikunia · 2022-07-30T10:31:21Z

src/partial_draw.jl

+
+returns the sum of all the lengths of the polys that this `jpath` contains
+"""
+len_jpath(jpath::JPath) = sum([


no need to create an array here

Wikunia · 2022-07-30T10:32:11Z

src/structs/JPath.jl

+JPath(polys, closed, fill, stroke, lastaction, linewidth) =
+    JPath(polys, closed, fill, stroke, lastaction, linewidth, nothing)
+
+CURRENT_JPATHS = JPath[] #TODO change to const later


can this be changed to const ?

Wikunia · 2022-07-30T10:32:56Z

src/structs/Object.jl

@@ -1,3 +1,4 @@
+include("JPath.jl")


let's keep all includes in one place, similar to the structs

Wikunia · 2022-07-30T10:34:17Z

test/morphing_old.jl

@@ -0,0 +1,217 @@
+astar(args...; do_action = :stroke) = star(Point(-100, -100), 30, 5, 0.5, 0, do_action)


can this file be removed seems like it's not used, right?

TheCedarPrince · 2022-08-02T06:20:27Z

Hey! Just did a first pass review of the PR - WOW.
@ArbitRandomUser and @Wikunia , this is absolutely incredible!
If it is alright, may I have one more day to do a few edits to the tutorial and try to follow along it?
Was also going to finish a run through of documentation.
Otherwise, incredible work!

ArbitRandomUser added 4 commits May 11, 2022 04:58

over-rides for strokepath , strokepreserve , fillpath and fillpreserv…

85089e7

…e, also introduces new pathtopoly

JPath struct added to Object.jl , getjpaths() and drawobj_jpaths(obj)…

1eb874b

… written

added 4 functions to no export

99852c5

format

d647fcf

ArbitRandomUser added 25 commits May 13, 2022 20:36

added try/catch around getjpaths, removed printlns , removed 4 functi…

8f658ad

…ons from no export (they should be exported)

removed one more println

f1ee862

commented out all printlns

8359dca

changed test_log to 4 warnings instead of 2

565eb8b

gah ! format

1a31a06

r , g ,b values were interchanged, fixed

5727fc5

seperated draobj_jpaths and drawjpaths

b59d6dd

added _morph_to(obj)

0a00793

format :(

2420635

rm morphs2.jl

4b9b269

minor fixes

99a82f7

pathtopoly makes 2 point polys into 3 point polys now

bf7a90f

format

8188e5a

morph now modifies draws morphed jpaths , and calls original object.f…

7d9a85f

…unc with luxor draw disabled

can git have hooks to prevent commits not formatted ? .. format commit

6d3cdc5

fixed transforms while getting jpaths

d651731

fixed empty JPaths to morph into and morph from , for objects with di…

3f14006

…fferent number of jpaths

format

9b4cf84

lastaction field added to JPath , decides order for stroke/fill

00921b0

format

ef775b2

null jpaths go to origin

49bb2fa

moved JPaths out to another file

07b6bba

commit adding JPath.jl

045548d

changed warning to print, write tests and change it back to warnings …

8f6a0e4

…later

added export morph

5bacde8

gpucce reviewed Jul 28, 2022

View reviewed changes

ArbitRandomUser added 5 commits July 29, 2022 10:12

fixed v,o,f in getjpath!

28ea04d

changlog.md and project.toml

4fa06d3

removed javis_do_action from luxor_utils

85bb447

moved JavisLuxorDispatcher to Javis.jl , added docs for DISABLE_LUXOR…

94c48bd

…DRAW and CURRENT_FETHCPATH_STATE

format

029339d

julia version bump

7e37455

bumped version in CI

b91e30a

Wikunia self-requested a review July 30, 2022 10:27

Wikunia approved these changes Jul 30, 2022

View reviewed changes

ArbitRandomUser added 10 commits July 30, 2022 23:23

typo fix

25286b0

changed to const; removed array around generator

0aa4473

fixed CURRENT_FETCHPATH_STATE

68e091a

fixed CURRENT_FETCHPATH_STATE

7748e6b

changed struct/Jpath.jl include

ca4be81

changed struct/Jpath.jl include

b405dc8

removed old morphing test

25d7892

format

c3e888c

updated stream_local.gif

974344c

made DISABLE_LUXOR_DRAW a const

2b2a64a

Wikunia merged commit 1e74392 into JuliaAnimators:main Aug 9, 2022

ArbitRandomUser mentioned this pull request Aug 17, 2022

Partial drawing of any Object #469

Closed

7 tasks

Sov-trotter added the GSoC'22 label Sep 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Morphs and Partially draw Objects #482

Morphs and Partially draw Objects #482

ArbitRandomUser commented May 13, 2022 •

edited

Loading

codecov-commenter commented May 13, 2022 •

edited

Loading

Wikunia commented Jul 27, 2022 •

edited

Loading

gpucce Jul 28, 2022 •

edited

Loading

Wikunia commented Jul 28, 2022

ArbitRandomUser commented Jul 29, 2022 •

edited

Loading

Wikunia commented Jul 29, 2022

ArbitRandomUser commented Jul 29, 2022

Wikunia commented Jul 29, 2022

Wikunia left a comment

Wikunia Jul 30, 2022

Wikunia Jul 30, 2022

Wikunia Jul 30, 2022

Wikunia Jul 30, 2022

Wikunia Jul 30, 2022

Wikunia Jul 30, 2022

TheCedarPrince commented Aug 2, 2022

		@@ -0,0 +1,217 @@
		astar(args...; do_action = :stroke) = star(Point(-100, -100), 30, 5, 0.5, 0, do_action)

Morphs and Partially draw Objects #482

Morphs and Partially draw Objects #482

Conversation

ArbitRandomUser commented May 13, 2022 • edited Loading

Install master branch Luxor.jl branch till Luxor 3.5 is released if you want to try out this PR

Examples for Morphs:

Object to Object morphs ...

Object to Function morphs ...

Keyframed morphs using Animations.jl

Examples for Partial Draw .

codecov-commenter commented May 13, 2022 • edited Loading

Codecov Report

Wikunia commented Jul 27, 2022 • edited Loading

gpucce Jul 28, 2022 • edited Loading

Choose a reason for hiding this comment

Wikunia commented Jul 28, 2022

ArbitRandomUser commented Jul 29, 2022 • edited Loading

Wikunia commented Jul 29, 2022

ArbitRandomUser commented Jul 29, 2022

Wikunia commented Jul 29, 2022

Wikunia left a comment

Choose a reason for hiding this comment

Wikunia Jul 30, 2022

Choose a reason for hiding this comment

Wikunia Jul 30, 2022

Choose a reason for hiding this comment

Wikunia Jul 30, 2022

Choose a reason for hiding this comment

Wikunia Jul 30, 2022

Choose a reason for hiding this comment

Wikunia Jul 30, 2022

Choose a reason for hiding this comment

Wikunia Jul 30, 2022

Choose a reason for hiding this comment

TheCedarPrince commented Aug 2, 2022

ArbitRandomUser commented May 13, 2022 •

edited

Loading

`Object` to `Object` morphs ...

`Object` to `Function` morphs ...

codecov-commenter commented May 13, 2022 •

edited

Loading

Wikunia commented Jul 27, 2022 •

edited

Loading

gpucce Jul 28, 2022 •

edited

Loading

ArbitRandomUser commented Jul 29, 2022 •

edited

Loading