misc updates

cormullion · cormullion · commit 3d347844b483 · 2022-05-20T11:04:50.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [v0.8.0] - ???
+## [v0.8.0] - 2022-05-20 11:01:59
 
 ### Added
 
@@ -12,6 +12,7 @@
 - Project.toml
 - some point3d comparisons
 - fixed wrong spherical/cartesian conversions
+- eachindex()
 
 ### Removed
 
diff --git a/Project.toml b/Project.toml
@@ -14,8 +14,8 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 
 [compat]
 julia = "1"
-Luxor = "3.1"
-StaticArrays = "0.10, 0.11, 0.12, 1.0"
+Luxor = "3.1, 3.2"
+StaticArrays = "0.10, 0.11, 0.12, 1"
 Rotations = "1"
 Colors = "0.7, 0.8, 0.9, 0.10, 0.11, 0.12, 0.13, 0.14"
 LaTeXStrings = "1.1, 1.2, 1.3"
diff --git a/docs/src/assets/figures/eyepoint.gif b/docs/src/assets/figures/eyepoint.gif
diff --git a/docs/src/objects.md b/docs/src/objects.md
@@ -294,3 +294,11 @@ nothing # hide
 ```
 
 ![custom object](assets/figures/juliaspheres.svg)
+
+This code uses the surface normal of each rectangular facet to change the color. The surface normal is an imaginary line that meets the facet at right angles, and indicates the direction of that facet. If you measure the distance between the surface normal and the direction of, say, the direction of a line from the origin to the eyepoint, you can obtain a value that indicates the orientation of the facet. You can then use this, as here, to change the color: an angle approaching π suggests that the facet is almost facing the viewer, and you can color it accordingly.
+
+![surface normal](assets/figures/eyepoint.gif)
+
+!!! note
+
+   It's hard work doing it all like this! There are easier ways...
diff --git a/examples/latex3d.jl b/examples/latex3d.jl
@@ -2,24 +2,36 @@ using Thebes
 using Luxor
 using LaTeXStrings
 using MathTeXEngine
-using MathTeXEngine
 using Rotations
 
-@draw begin
+function frame(scene, framenumber)
+    eased_n = scene.easingfunction(framenumber - scene.framerange.start,
+      0, 1, scene.framerange.stop - scene.framerange.start)
+
     background(0.0, 0.05, 0.1)
     helloworld()
-    perspective(300)
-    eyepoint(200, 200, 200)
+    perspective(600)
+    eyepoint(200, 20, 50)
     sethue("white")
-    fontsize(20)
+    fontsize(40)
     setline(1)
-    e = L"e^{i\pi} + 1 = 0"
-    for i in 0:π/10:2π - π/10
-        text3D(e,
-            sphericaltocartesian(50, i, π/2),
-            action=:stroke,
-            about=sphericaltocartesian(50, i, π/2),
-            rotation=RotZ(i),
-            portion=1.0)
+
+    t₁ = L"e^{i\pi} + 1 = 0"
+
+    sethue("gold")
+
+    for x in 0:25:500
+      setopacity(rescale(x, 0, 500, 1, 0))
+      leftpt = Point3D(-x, 0, 0)
+      text3D(t₁, leftpt,
+        action=:stroke,
+        halign=:center,
+        about=leftpt,
+        rotation=RotYXZ(-π/2, π, -π/2),
+        portion=eased_n)
     end
+
 end
+
+amovie = Movie(600, 600, "latex the movie")
+animate(amovie, Scene(amovie, frame, 1:150), creategif=true, pathname="/tmp/latexanimation.gif")
diff --git a/src/Object.jl b/src/Object.jl
@@ -52,7 +52,7 @@ function make(vf, name="unnamed")
     # don't redefine when passed an array
     vertices = deepcopy(vf[1])
     faces    = deepcopy(vf[2])
-    labels   = collect(1:length(faces))
+    labels   = collect(eachindex(faces))
     return Object(vertices, faces, labels, name)
 end
 
@@ -106,7 +106,7 @@ function objecttopoly(o::Object)
     end
     facepolys = Array[]
     if length(o.faces) > 0
-        for n in 1:length(o.faces)
+        for n in eachindex(o.faces)
             push!(facepolys, vertices2D[o.faces[n]])
         end
     end
@@ -251,7 +251,7 @@ end
 Set the position of object to Point3D(x, y, z).
 """
 function moveby!(o::Object, x, y, z)
-   for n in 1:length(o.vertices)
+   for n in eachindex(o.vertices)
        nv = o.vertices[n]
        o.vertices[n] = Point3D(nv.x + x, nv.y + y, nv.z + z)
    end
@@ -278,7 +278,7 @@ moveby!(o::Object, pt::Point3D) = moveby!(o::Object, pt.x, pt.y, pt.z)
 Scale object by x in x, y in y, and z in z.
 """
 function scaleby!(o::Object, x, y, z)
-   for n in 1:length(o.vertices)
+   for n in eachindex(o.vertices)
        nv = o.vertices[n]
        o.vertices[n] = Point3D(nv.x * x, nv.y * y, nv.z * z)
    end
@@ -306,14 +306,14 @@ Rotate an object through rotation `r`, or around the x, y,
 and/or z axis by `angleX`, `angleY`, `angleZ`.
 """
 function rotateby!(o::Object, angleX, angleY, angleZ)
-    for n in 1:length(o.vertices)
+    for n in eachindex(o.vertices)
         o.vertices[n] = RotXYZ(angleX, angleY, angleZ) * o.vertices[n]
     end
     return o
 end
 
 function rotateby!(o::Object, r::Rotation)
-    for n in 1:length(o.vertices)
+    for n in eachindex(o.vertices)
         o.vertices[n] = r * o.vertices[n]
     end
     return o
@@ -341,7 +341,7 @@ end
 Rotate an object around a point by rotation r, or angleX, angleY, angleZ.
 """
 function rotateby!(o::Object, pt::Point3D, angleX, angleY, angleZ)
-    for n in 1:length(o.vertices)
+    for n in eachindex(o.vertices)
         v = o.vertices[n] - pt
         v = rotateX(v, angleX)
         v = rotateY(v, angleY)
@@ -352,7 +352,7 @@ function rotateby!(o::Object, pt::Point3D, angleX, angleY, angleZ)
 end
 
 function rotateby!(o::Object, pt::Point3D, r::Rotation=RotXYZ(0, 0, 0))
-    for n in 1:length(o.vertices)
+    for n in eachindex(o.vertices)
         v = o.vertices[n] * r
         o.vertices[n] = v
     end
diff --git a/src/Point3D.jl b/src/Point3D.jl
@@ -343,7 +343,7 @@ moveby!(ptlist::Array{Point3D, 1}, x, y, z) = moveby!(ptlist, Point3D(x, y, z))
 Scales a list of points by multiplying by `x` in X, `y` in Y, `z` in Z.
 """
 function scaleby!(ptlist::Array{Point3D, 1}, x, y, z)
-   for n in 1:length(ptlist)
+   for n in eachindex(ptlist)
        v = ptlist[n]
        ptlist[n] = Point3D(v.x * x, v.y * y, v.z * z)
    end
@@ -357,7 +357,7 @@ Finds one of these.
 """
 function surfacenormal(ptlist::Array{Point3D, 1})
    normal = Point3D(0, 0, 0)
-   for i in 1:length(ptlist)
+   for i in eachindex(ptlist)
       vertexCurrent = ptlist[i]
       vertexNext    = ptlist[mod1(i + 1, end)]
       x = normal.x + ( (vertexCurrent.y - vertexNext.y) * (vertexCurrent.z + vertexNext.z))
diff --git a/src/latex.jl b/src/latex.jl
@@ -2,85 +2,7 @@ using LaTeXStrings
 import MathTeXEngine:
     generate_tex_elements, inkwidth, inkheight, bottominkbound, TeXChar, HLine
 
-    # function text3D(str::LaTeXString, anchor::Point3D;
-    #         halign=:left,
-    #         valign=:baseline,
-    #         about=Point3D(0., 0., 0.),
-    #         rotation::Rotation=RotXYZ(0, 0, 0))
-    #
-    #     # this is just a hacked version of the Luxor code
-    #
-    #     # Function from MathTexEngine
-    #     sentence = generate_tex_elements(str)
-    #
-    #     # Get current font size.
-    #     font_size = get_fontsize()
-    #
-    #     textw, texth = latextextsize(str)
-    #     bottom_pt, top_pt = rawlatexboundingbox(str)
-    #
-    #     translate_x, translate_y = Luxor.texalign(halign, valign, bottom_pt, top_pt, font_size)
-    #
-    #     pt = project(anchor)
-    #
-    #     rotationfixed=true
-    #     # Writes text using ModernCMU font.
-    #     for text in sentence
-    #         if isnothing(pt)
-    #             continue
-    #         end
-    #         @layer begin
-    #             translate(pt)
-    #             if !rotationfixed
-    #                 #rotate(angle) ?
-    #                 translate(translate_x, translate_y)
-    #             else
-    #                 l_pt, r_pt = Luxor.latexboundingbox(str, halign = halign, valign = valign)
-    #                 translate((l_pt + r_pt)/2)
-    #                 #rotate(angle) ?
-    #                 translate(Point(translate_x, translate_y) - (l_pt + r_pt)/2)
-    #             end
-    #             if text[1] isa TeXChar
-    #                 fontface(text[1].font.family_name)
-    #                 fontsize(font_size * text[3])
-    #
-    #                 textoutlines(string(text[1].char), Point(text[2]...) * font_size * (1, -1), :path,
-    #                     halign=halign,
-    #                     valign=valign,
-    #                     startnewpath=true)
-    #                 o = getpathflat()
-    #                 newpath() # otherwise the path would be drawn twice
-    #                 for e in o
-    #                     if e.element_type == 0
-    #                         (x, y) = e.points
-    #                         newpt = rotateby(Point3D(anchor.x + x, anchor.y -y, anchor.z), about, rotation)
-    #                         pin(newpt,  gfunction = (p3, p2) -> move(p2))
-    #                     elseif e.element_type == 1
-    #                         (x, y) = e.points
-    #                         newpt = rotateby(Point3D(anchor.x + x, anchor.y -y, anchor.z), about, rotation)
-    #                         pin(newpt,  gfunction = (p3, p2) -> line(p2))
-    #                     elseif e.element_type == 3
-    #                         closepath()
-    #                     else
-    #                         error("unknown path element " * repr(e.element_type) * repr(e.points))
-    #                     end
-    #                 end
-    #                 fillpath()
-    #
-    #             elseif text[1] isa HLine
-    #                 pointstart = Point(text[2]...) * font_size * (1, -1)
-    #                 pointend = pointstart + Point(text[1].width, 0) * font_size
-    #
-    #                 newstartpt = rotateby(Point3D(anchor.x + pointstart.x, anchor.y - pointstart.y, anchor.z), about, rotation)
-    #                 newendpt = rotateby(Point3D(anchor.x + pointend.x, anchor.y - pointend.y, anchor.z), about, rotation)
-    #
-    #                 pin(newstartpt, newendpt)
-    #             end
-    #         end
-    #     end
-    # end
-
-    # try this version using Paths
+# try this version using Paths
 
 """
 text3D(str::LaTeXString, anchor::Point3D;
@@ -93,7 +15,7 @@ text3D(str::LaTeXString, anchor::Point3D;
         startnewpath=true,
         action=:fill)
 
-Like `text3D()` but draws LaTeX strings.
+Like `text3D()` but draws LaTeX strings. Needs Luxor >= 3.1.
 """
 function text3D(str::LaTeXString, anchor::Point3D;
         halign=:left,
@@ -104,6 +26,7 @@ function text3D(str::LaTeXString, anchor::Point3D;
         steps = 20,
         startnewpath=true,
         action=:fill)
+
     text(str, paths=true, halign=halign, valign=valign) # angle? rotationfixed?
     latexpath = storepath()
     drawpath(latexpath, portion, anchor, action=action, startnewpath=startnewpath, about=about, rotation=rotation, steps=steps)
diff --git a/test/test-4.jl b/test/test-4.jl
@@ -24,7 +24,7 @@ function main()
     for (pos, n) in tiles
         @layer begin
             translate(pos)
-            object = make(moreobjects[rand(1:length(moreobjects))])
+            object = make(moreobjects[rand(eachindex(moreobjects))])
 
             scaleby!(object, 30, 30, 30)
             moveby!(object, 1 * rand(), 1 * rand(), 10 * rand())
