3D Camera Orientation Widget

src/basic_recipes/text.jl

@@ -440,14 +440,8 @@ function float_justification(ju, al)::Float32
         else
             0.5f0
         end
-    elseif ju === :left
-        0.0f0
-    elseif ju === :right
-        1.0f0
-    elseif ju === :center
-        0.5f0
     else
-        Float32(ju)
+        halign2num(ju, "Justification $ju not recognized. Should be :left, :center, :right, a Number or automatic.")
     end
 end
 

src/camera/camera3d.jl

@@ -233,13 +233,14 @@ cam3d_cad!(scene; cad = true, zoom_shift_lookat = false, fixed_axis = false, kwa
     Camera3D(scene, cad = cad, zoom_shift_lookat = zoom_shift_lookat, fixed_axis = fixed_axis; kwargs...)
 
 function deselect_all_cameras!(scene)
-    cam = cameracontrols(scene)
-    cam isa Camera3D && (cam.attributes.selected[] = false)
+    deselect_camera!(cameracontrols(scene))
     for child in scene.children
         deselect_all_cameras!(child)
     end
     nothing
 end
+deselect_camera!(cam::Camera3D) = cam.attributes.selected[] = false
+deselect_camera!(::AbstractCamera) = nothing
 
 
 function add_translation!(scene, cam::Camera3D)

src/conversions.jl

@@ -948,7 +948,7 @@ convert_attribute(c::VecTypes{N}, ::key"position") where N = Point{N, Float32}(c
 """
     Text align, e.g.:
 """
-to_align(x::Tuple{Symbol, Symbol}) = Vec2f(alignment2num.(x))
+to_align(x::Tuple{Symbol, Symbol}) = Vec2f(halign2num(x[1]), valign2num(x[2]))
 to_align(x::Vec2f) = x
 
 const FONT_CACHE = Dict{String, NativeFont}()

src/layouting/layouting.jl

@@ -179,14 +179,8 @@ function glyph_collection(
         else
             0.5f0
         end
-    elseif justification === :left
-        0.0f0
-    elseif justification === :right
-        1.0f0
-    elseif justification === :center
-        0.5f0
     else
-        Float32(justification)
+        halign2num(justification, "Invalid justification $justification. Valid values are <:Number, :left, :center and :right.")
     end
 
     xs_justified = map(xs, width_differences) do xsgroup, wd
@@ -203,17 +197,7 @@ function glyph_collection(
     ys = cumsum([0.0; -lineheights[2:end]])
 
     # compute x values after left/center/right alignment
-    halign = if halign isa Number
-        Float32(halign)
-    elseif halign === :left
-        0.0f0
-    elseif halign === :center
-        0.5f0
-    elseif halign === :right
-        1.0f0
-    else
-        error("Invalid halign $halign. Valid values are <:Number, :left, :center and :right.")
-    end
+    halign = halign2num(halign)
     xs_aligned = [xsgroup .- halign * maxwidth for xsgroup in xs_justified]
 
     # for y alignment, we need the largest ascender of the first line
@@ -233,17 +217,7 @@ function glyph_collection(
     ys_aligned = if valign === :baseline
         ys .- first_line_ascender .+ overall_height .+ last_line_descender
     else
-        va = if valign isa Number
-            Float32(valign)
-        elseif valign === :top
-            1f0
-        elseif valign === :bottom
-            0f0
-        elseif valign === :center
-            0.5f0
-        else
-            error("Invalid valign $valign. Valid values are <:Number, :bottom, :baseline, :top, and :center.")
-        end
+        va = valign2num(valign, "Invalid valign $valign. Valid values are <:Number, :bottom, :baseline, :top, and :center.")
         ys .- first_line_ascender .+ (1 - va) .* overall_height
     end
 
@@ -287,14 +261,6 @@ function padded_vcat(arrs::AbstractVector{T}, fillvalue) where T <: AbstractVect
     arr
 end
 
-function alignment2num(x::Symbol)
-    (x === :center) && return 0.5f0
-    (x in (:left, :bottom)) && return 0.0f0
-    (x in (:right, :top)) && return 1.0f0
-    return 0.0f0 # 0 default, or better to error?
-end
-
-
 # Backend data
 
 _offset_to_vec(o::VecTypes) = to_ndim(Vec3f, o, 0)

src/makielayout/MakieLayout.jl

@@ -34,6 +34,7 @@ include("blocks/legend.jl")
 include("blocks/scene.jl")
 include("blocks/menu.jl")
 include("blocks/textbox.jl")
+include("blocks/ballcontroller.jl")
 
 export Axis
 export Axis3

src/makielayout/blocks/axis.jl

@@ -436,15 +436,8 @@ function initialize_block!(ax::Axis; palette = nothing)
                        ignore_equal_values=true) do a,
         titlegap, align, xaxisposition, xaxisprotrusion
 
-        x = if align === :center
-            a.origin[1] + a.widths[1] / 2
-        elseif align === :left
-            a.origin[1]
-        elseif align === :right
-            a.origin[1] + a.widths[1]
-        else
-            error("Title align $align not supported.")
-        end
+        align_factor = halign2num(align, "Title align $align not supported.")
+        x = a.origin[1] + align_factor * a.widths[1]
 
         yoffset = top(a) + titlegap + (xaxisposition === :top ? xaxisprotrusion : 0f0)
 

src/makielayout/blocks/axis3d.jl

@@ -82,15 +82,8 @@ function initialize_block!(ax::Axis3)
 
     titlepos = lift(scene, scene.px_area, ax.titlegap, ax.titlealign) do a, titlegap, align
 
-        x = if align === :center
-            a.origin[1] + a.widths[1] / 2
-        elseif align === :left
-            a.origin[1]
-        elseif align === :right
-            a.origin[1] + a.widths[1]
-        else
-            error("Title align $align not supported.")
-        end
+        align_factor = halign2num(align, "Title align $align not supported.")
+        x = a.origin[1] + align_factor * a.widths[1]
 
         yoffset = top(a) + titlegap