text rotations fix?

Author: cormullion

Project.toml

@@ -1,7 +1,7 @@
 name = "Thebes"
 uuid = "8b424ff8-82f5-59a4-86a6-de3761897198"
 authors = ["cormullion <[email protected]>"]
-version = "0.3.0"
+version = "0.4.0"
 
 [deps]
 Luxor = "ae8d54c2-7ccd-5906-9d76-62fc9837b5bc"

README.md

@@ -33,8 +33,8 @@ Luxor.jl is built on [Cairo.jl](https://github.com/JuliaGraphics/Cairo.jl), and
 [pkg-0.7-img]: http://pkg.julialang.org/badges/Thebes_0.7.svg
 [pkg-0.7-url]: http://pkg.julialang.org/?pkg=Thebes&ver=0.7
 
-[travis-img]: https://travis-ci.org/cormullion/Thebes.jl.svg?branch=master
-[travis-url]: https://travis-ci.org/cormullion/Thebes.jl
+[travis-img]: https://travis-ci.com/cormullion/Thebes.jl.svg?branch=master
+[travis-url]: https://travis-ci.com/cormullion/Thebes.jl
 
 [appvey-img]: https://ci.appveyor.com/api/projects/status/jfa9e54lv92rqd3m?svg=true
 [appvey-url]: https://ci.appveyor.com/project/cormullion/thebes-jl/branch/master

REQUIRE

@@ -28,7 +28,7 @@ fontsize(40)
 fontface("Georgia-Italic")
 
 text3D("the x-axis", Point3D(50, 0, 0))
-text3D("the y-axis", Point3D(0, 50, 0), rotation=(0, 0, π/2))
+text3D("the y-axis", Point3D(0, 50, 0), center=Point3D(0, 50, 0), rotation=(π/2, 0, π/2))
 text3D("the z-axis", Point3D(0, 0, 0), rotation=(0, π/2, 0), halign=:right)
 
 finish() # hide
@@ -41,7 +41,7 @@ You can also use some of Luxor's text functions, such as `textextents()`, which
 
 ```@example
 using Thebes, Luxor, Colors # hide
-Drawing(600, 500, "assets/figures/text2.svg") # hide
+Drawing(800, 600, "assets/figures/text2.svg") # hide
 background("black") # hide
 origin() # hide
 eyepoint(Point3D(250, 250, 550))
@@ -52,11 +52,11 @@ fontsize(50)
 te = textextents("Julia")
 
 for y in -1200:te[3]:1200
-    for x in -1200:te[4]:1200
-            sethue(HSB(mod(x*y, 360), .8, .8))
-            text3D("Julia", Point3D(x, y, 0), rotation=(0, 0, π/2))
+        for x in -1200:te[4]:1200
+            sethue(HSB(mod(x*y, 360), .6, .9))
+        text3D("Julia", Point3D(x, y, 0), center=Point3D(x, y, 0), rotation=(0,0,π/2))
+        end
     end
-end
 finish() # hide
 nothing # hide
 ```

docs/src/assets/figures/repository-open-graph-template.png

@@ -1,7 +1,5 @@
 using Thebes, Luxor, Colors
 
-
-
 function frame(scene, fn)
     background("black")
     eased_n = scene.easingfunction(fn, 0, 1, scene.framerange.stop)

docs/src/text.md

@@ -1,18 +1,22 @@
 """
     text3D(str, pt::Point3D;
-        halign=:left,
-        valign=:baseline,
-        rotation = (0, 0, 0)))
+        halign = :left,
+        valign = :baseline,
+        center = Point3D(0, 0, 0),
+        rotation = (0, 0, 0))
 
 Draw text at point `pt`, lying in the plane of the x axis.
-Angles in `rotation` can rotate the text away from the x
-plane around the x, y, and z axes.
+Angles in `rotation` rotate the text. The `center` of rotation defaults 
+to `Point3D(0, 0, 0)`.
 
 Uses current `fontface()` and `fontsize()` settings.
+
+TODO Make sense of it all.
 """
-function text3D(str, origin::Point3D;
+function text3D(str, anchor::Point3D;
         halign=:left,
         valign=:baseline,
+        center=Point3D(0, 0, 0),
         rotation = (0, 0, 0))
 
     textoutlines(str, O, :path,
@@ -22,16 +26,15 @@ function text3D(str, origin::Point3D;
 
     o = getpathflat()
     newpath() # otherwise the path would be drawn twice
-    z = origin.z
-    for e in o
+     for e in o
         if e.element_type == 0
             (x, y) = e.points
-            pt3 = rotateby(origin + Point3D(x, -y, z), origin, rotation...)
-            pin(pt3, gfunction = (p3, p2) -> move(p2))
+            newpt = rotateby(Point3D(anchor.x + x, anchor.y -y, anchor.z), center, rotation...)
+            pin(newpt,  gfunction = (p3, p2) -> move(p2))
         elseif e.element_type == 1
             (x, y) = e.points
-            pt3 = rotateby(origin + Point3D(x, -y, z), origin, rotation...)
-            pin(pt3, gfunction = (p3, p2) -> line(p2))
+            newpt = rotateby(Point3D(anchor.x + x, anchor.y -y, anchor.z), center, rotation...)
+            pin(newpt,  gfunction = (p3, p2) -> line(p2))
         elseif e.element_type == 3
             closepath()
         else