misc updates

Author: cormullion

Project.toml

@@ -1,11 +1,12 @@
 name = "Thebes"
 uuid = "8b424ff8-82f5-59a4-86a6-de3761897198"
 authors = ["cormullion <[email protected]>"]
-version = "0.1.0"
+version = "0.2.0"
 
 [deps]
 Luxor = "ae8d54c2-7ccd-5906-9d76-62fc9837b5bc"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [extras]
 Luxor = "ae8d54c2-7ccd-5906-9d76-62fc9837b5bc"
@@ -18,5 +19,5 @@ test = ["Test", "Random", "Luxor"]
 
 [compat]
 julia = "1"
-Luxor = "2"
+Luxor = "1, 2"
 Colors = "0.7, 0.8, 0.9, 0.10, 0.11, 0.12, 0.13, 0.14"

docs/src/assets/logo.svg

@@ -256,11 +256,11 @@ object = make(Cube, "cube")
 setscale!(object, 100, 100, 100)
 
 # draw as is
-setposition!(object, Point3D(0, -200, 0))
+moveby!(object, Point3D(0, -200, 0))
 pin(object, gfunction = mygfunction)
 
 # draw with sorted faces
-setposition!(object, Point3D(0, 400, 0))
+moveby!(object, Point3D(0, 400, 0))
 sortfaces!(object, eyepoint=eyepoint())
 pin(object, gfunction = mygfunction)
 

docs/src/objects.md

@@ -127,8 +127,8 @@ rotateby
 You can change the position and scale of things:
 
 ```@docs
-setposition!
-setposition
+moveby!
+moveby
 setscale!
 ```
 

docs/src/tools.md

@@ -23,7 +23,7 @@ function frame(scene, framenumber)
       n = x * y * z
       object = make(tetrahedron)
       setscale!(object, 10, 10, 10)
-      setposition!(object, x * 25, y * 25, z * 25)
+      moveby!(object, x * 25, y * 25, z * 25)
       d = distance(object.vertices[end], Point3D(0, 0, 0))
       if d < 1200
           pin(object, gfunction=mygfunction)

examples/animation-example.jl

@@ -18,7 +18,7 @@ setopacity(1)
 for i in -20:10:20, j in -20:10:20, z in -20:10:20
     object = make(sphere2)
     setscale!(object, 50, 50, 50)
-    setposition!(object, i * 15, j * 15, z * 15)
+    moveby!(object, i * 15, j * 15, z * 15)
     d = distance(object.vertices[1], Point3D(0, 0, 0))
     if d < 300
         pin(object)

examples/balls.jl

@@ -40,7 +40,7 @@ function main()
             scalefactor = distance(extrema(object.vertices)...)
 
             loc = Point3D(x, y, 0)
-            setposition!(object, loc)
+            moveby!(object, loc)
 
             setscale!(object, 1/scalefactor * K, 1/scalefactor * K, 1/scalefactor * K)
             randomhue()

examples/drawevenmoreobjects.jl

@@ -17,7 +17,7 @@ function drawgeodesic(object, cpos, cscale, rotx, roty, rotz, eased)
     eyepoint(Point3D(1200, 1200, 200))
 
     c = setscale!(object, cscale.x, cscale.y, cscale.z)
-    setposition!(c, cpos)
+    moveby!(c, cpos)
     theta = rescale(eased, 0, 1, 0, 2pi)
     rotateby!(c, Point3D(0, 0, 0), theta, theta, theta)
     pin(c, gfunction= mygfunction)

examples/rotating-geodesic.jl

@@ -4,12 +4,9 @@ function mygfunction(vertices, faces, labels; action=:fill)
     if !isempty(faces)
         @layer begin
             for (n, p) in enumerate(faces)
-                x = mod1(n, length(cols))
-                c = cols[mod1(labels[x], length(cols))]
-
                 @layer begin
                     setopacity(0.5)
-                    sethue(c)
+                    randomhue()
                     poly(p, action)
                 end
 
@@ -32,8 +29,6 @@ end
 
     #object = make(Cube, "Cube")
     #object = make(Tetrahedron, "Tetrahedron")
-    #object = make(AxesWire, "AxesWire")
-    #object = make(Carpet, "Carpet")
     object = make(Pyramid, "Pyramid")
 
     setscale!(object, 100, 100, 100)

examples/simple-objects.jl

@@ -75,7 +75,7 @@ end
     for x in -200:40:200
         for y in -200:40:200
             randomhue()
-            pin(setposition!(15makecube(), Point3D(x, y, 0)))
+            pin(moveby!(15makecube(), Point3D(x, y, 0)))
         end
     end
 

examples/simple-pin.jl

@@ -191,12 +191,12 @@ function pin(m::Array{Object, 1};
 end
 
 """
-    setposition!(m::Object, x, y, z)
-    setposition!(m::Object, pt::Point3D)
+    moveby!(m::Object, x, y, z)
+    moveby!(m::Object, pt::Point3D)
 
 Set the position of object to Point3D(x, y, z).
 """
-function setposition!(m::Object, x, y, z)
+function moveby!(m::Object, x, y, z)
    for n in 1:length(m.vertices)
        nv = m.vertices[n]
        m.vertices[n] = Point3D(nv.x + x, nv.y + y, nv.z + z)
@@ -205,18 +205,18 @@ function setposition!(m::Object, x, y, z)
 end
 
 """
-    setposition(m::Object, x, y, z)
-    setposition(m::Object, pt::Point3D)
+    moveby(m::Object, x, y, z)
+    moveby(m::Object, pt::Point3D)
 
 Set the position of a copy of the object to Point3D(x, y, z).
 """
-function setposition(m::Object, x, y, z)
+function moveby(m::Object, x, y, z)
    mcopy = deepcopy(m)
-   return setposition!(mcopy, x, y, z)
+   return moveby!(mcopy, x, y, z)
 end
 
-setposition(m::Object, pt::Point3D) = setposition(m::Object, pt.x, pt.y, pt.z)
-setposition!(m::Object, pt::Point3D) = setposition!(m::Object, pt.x, pt.y, pt.z)
+moveby(m::Object, pt::Point3D) = moveby(m::Object, pt.x, pt.y, pt.z)
+moveby!(m::Object, pt::Point3D) = moveby!(m::Object, pt.x, pt.y, pt.z)
 
 """
    setscale!(m::Object, x, y, z)

src/Object.jl

@@ -195,10 +195,13 @@ function rotateZ(pt3D::Point3D, rad)
     return Point3D(x, y, pt3D.z)
 end
 
+# rotate around axes
+
 """
     rotateby(pt::Point3D, angleX, angleY, angleZ)
+    rotateby(ptlist::Array{Point3D, 1}, angleX, angleY, angleZ)
 
-Return a new point resulting from rotating the specified point
+Return a new point/list of points resulting from rotating
 around the x, y, and z axes by angleX, angleY, angleZ.
 """
 function rotateby(pt::Point3D, angleX, angleY, angleZ)
@@ -208,10 +211,30 @@ function rotateby(pt::Point3D, angleX, angleY, angleZ)
     return v
 end
 
+function rotateby(ptlist::Array{Point3D, 1}, angleX, angleY, angleZ)
+    return rotateby.(ptlist, angleX, angleY, angleZ)
+end
+
+"""
+    rotateby!(ptlist::Array{Point3D, 1}, angleX, angleY, angleZ)
+
+Return the list of points with each one rotated
+around the x, y, and z axes by angleX, angleY, angleZ.
+"""
+function rotateby!(ptlist::Array{Point3D, 1}, angleX, angleY, angleZ)
+    for i in eachindex(ptlist)
+        ptlist[i] = rotateby(ptlist[i], angleX, angleY, angleZ)
+    end
+    return ptlist
+end
+
+# rotate around point
+
 """
     rotateby(newpt::Point3D, existingpt::Point3D, angleX, angleY, angleZ)
 
-Return a new point resulting from rotating the point by angleX, angleY, angleZ around another point.
+Return a new point/list resulting from rotating each point
+by angleX, angleY, angleZ around another point.
 """
 function rotateby(newpt::Point3D, existingpt::Point3D, angleX, angleY, angleZ)
     v = newpt - existingpt
@@ -222,15 +245,29 @@ function rotateby(newpt::Point3D, existingpt::Point3D, angleX, angleY, angleZ)
 end
 
 """
-    setposition!(ptlist::Point3D, pt::Point3D)
+    rotateby!(ptlist::Point3D, existingpt::Point3D, angleX, angleY, angleZ)
+
+Rotate each point in the list by angleX, angleY, angleZ around another point.
+"""
+function rotateby!(ptlist::Array{Point3D, 1}, existingpt::Point3D, angleX, angleY, angleZ)
+    for i in eachindex(ptlist)
+        ptlist[i] = rotateby(ptlist[i], existingpt, angleX, angleY, angleZ)
+    end
+    return ptlist
+end
 
-Move points by a vector..
+"""
+    moveby!(ptlist::Point3D, x, y, z)
+    moveby!(ptlist::Point3D, pt::Point3D)
 
+Move all points in the list by a vector.
 """
-function setposition!(ptlist::Array{Point3D, 1}, pt::Point3D)
-    return (+).(ptlist, pt)
+function moveby!(ptlist::Array{Point3D, 1}, pt::Point3D)
+    return ptlist .+= pt
 end
 
+moveby!(ptlist::Array{Point3D, 1}, x, y, z) = moveby!(ptlist, Point3D(x, y, z))
+
 """
     surfacenormal(ptlist)
 

src/Point3D.jl

@@ -26,7 +26,7 @@ export project, Projection, newprojection,
 
        rotateX, rotateY, rotateZ, rotateby!, rotateby,
 
-       setposition!, setposition,
+       moveby!, moveby,
 
        objecttopoly,
        setscale!, sortfaces!,

src/Thebes.jl

@@ -19,7 +19,7 @@ function main()
             axes3D(150)
             object = make(Cube)
             setscale!(object, 25, 25, 25)
-            setposition!(object, 0, 0, 0)
+            moveby!(object, 0, 0, 0)
             rotateby!(object, 0, n/5, 0)
             sortfaces!(object)
             pin(object, gfunction=mygfunction)

test/test-1.jl

@@ -47,9 +47,9 @@ function main()
     setscale!(khafre,  21.6/2, 21.6/2, 14.3)
     setscale!(menkaure, 10.9/2, 10.9/2, 6.6)
 
-    setposition!(khufu,     30, 30, 0)
-    setposition!(khafre,   -0, -0, 0)
-    setposition!(menkaure, -30, -30, 0)
+    moveby!(khufu,     30, 30, 0)
+    moveby!(khafre,   -0, -0, 0)
+    moveby!(menkaure, -30, -30, 0)
 
     # needs depth sorting of faces
     sortfaces!.(pyramids, eyepoint=eyepoint())

test/test-2.jl

@@ -22,7 +22,7 @@ function main()
             objects = [object]
             s = rescale(k, 5, 20, 10, 20)
             setscale!.(objects, s, s, s)
-            setposition!.(objects, rescale(k, 1, 20, 50, 400), 1, 0)
+            moveby!.(objects, rescale(k, 1, 20, 50, 400), 1, 0)
             a = rescale(i, 1, 20, 0, 2pi)
             rotateby!.(objects, 0, 0, a)
             sortfaces!(objects, eyepoint = eyepoint)

test/test-3.jl

@@ -1,6 +1,6 @@
 using Thebes, Luxor
 
-include(string(@__FILE__, "../../../data/moreobjects.jl"))
+include(dirname(pathof(Thebes)) * "/../data/moreobjects.jl")
 
 moreobjects = [boxcube, boxtorus, concave, cone, crossshape, cube,
 cuboctahedron, dodecahedron , geodesic, # helix2, icosahedron,
@@ -40,7 +40,7 @@ function main()
             object = make(moreobjects[rand(1:length(moreobjects))])
 
             setscale!(object, 30, 30, 30)
-            setposition!(object, 1 * rand(), 1 * rand(), 10 * rand())
+            moveby!(object, 1 * rand(), 1 * rand(), 10 * rand())
             rotateby!(object, #= object.vertices[1],=# 2pi * rand(), 2pi * rand(), 2pi * rand())
             sortfaces!(object)
             pin(object, gfunction= anothergfunction)

test/test-4.jl

@@ -1,6 +1,6 @@
 using Luxor, Thebes
 
-include(string(@__FILE__, "../../../data/moreobjects.jl"))
+include(dirname(pathof(Thebes)) * "/../data/moreobjects.jl")
 
 moreobjects = [boxcube, boxtorus, concave, cone, crossshape, cube,
 cuboctahedron, dodecahedron , geodesic, # helix2, icosahedron,

test/test-5.jl

@@ -1,6 +1,6 @@
 using Thebes
 
-include(string(@__FILE__, "../../../data/moreobjects.jl"))
+include(dirname(pathof(Thebes)) * "/../data/moreobjects.jl")
 
 moreobjects = [boxcube, boxtorus, concave, cone, crossshape, cube, cuboctahedron, dodecahedron , geodesic, helix2,
 icosahedron, icosidodecahedron, octahedron, octtorus, rhombicosidodecahedron,

test/test-6.jl

@@ -1,6 +1,6 @@
 using Thebes, Luxor
 
-include(string(@__FILE__, "../../../data/moreobjects.jl"))
+include(dirname(pathof(Thebes)) * "/../data/moreobjects.jl")
 
 platonics = [:boxtorus, :concave, :cone, :crossshape, :cube, :cuboctahedron, :dodecahedron , :geodesic, :helix2,
 :icosahedron, :icosidodecahedron, :octahedron, :octtorus, :rhombicosidodecahedron,
@@ -35,12 +35,12 @@ function main()
         for y in -100:50:100
             object = make(moreobjects[2])
             setscale!(object, 10, 10, 10)
-            setposition!(object, x, y, 50rand())
+            moveby!(object, x, y, 50rand())
             rotateby!(object, object.vertices[1], rand(), rand(), rand())
             pin(object, gfunction = anothergfunction)
 
             # dark version
-            setposition!(object, 0, 0, -object.vertices[1].z)
+            moveby!(object, 0, 0, -object.vertices[1].z)
             setscale!(object, 1, 1, 0)
             pin(object, gfunction = anothergfunction)
         end