Fix #80, extents of Cylinder is a Point, not a Vec.

rdeits · Dec 10, 2018 · 0596a0f · 0596a0f
1 parent d93d0a7
commit 0596a0f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/geometry.jl b/src/geometry.jl
@@ -29,7 +29,7 @@ end
 center(geometry::HyperRectangle) = minimum(geometry) + 0.5 * widths(geometry)
 center(geometry::HyperCube) = minimum(geometry) + 0.5 * widths(geometry)
 center(geometry::HyperSphere) = origin(geometry)
-center(geometry::Cylinder) = origin(geometry) + geometry.extremity / 2
+center(geometry::Cylinder) = (origin(geometry) + geometry.extremity) / 2
 
 """
 $(SIGNATURES)
@@ -48,6 +48,6 @@ intrinsic_transform(g::HyperCube) = Translation(center(g)...)
 
 function intrinsic_transform(g::Cylinder{3})
     # Three.js wants a cylinder to lie along the y axis
-    R = rotation_between(SVector(0, 1, 0), g.extremity)
+    R = rotation_between(SVector(0, 1, 0), g.extremity - origin(g))
     Translation(center(g)) ∘ LinearMap(R)
 end
diff --git a/src/lowering.jl b/src/lowering.jl
@@ -69,7 +69,7 @@ function lower(c::Cylinder{3})
         "type" => "CylinderGeometry",
         "radiusTop" => radius(c),
         "radiusBottom" => radius(c),
-        "height" => max(norm(c.extremity), eps(Float32)),
+        "height" => max(norm(c.extremity - origin(c)), eps(Float32)),
         "radialSegments" => 100,
     )
 end

diff --git a/test/visualizer.jl b/test/visualizer.jl
@@ -74,7 +74,7 @@ end
         end
 
         @testset "more complicated cylinder" begin
-            setobject!(v[:cylinder2], Cylinder(Point(0, 2.5, 0), Point(0.1, 0.1, 0), 0.05))
+            setobject!(v[:cylinder2], Cylinder(Point(0, 2.5, 0), Point(0.1, 2.6, 0), 0.05))
             settransform!(v[:cylinder2], Translation(0, 0, 0.05))
         end