diff --git a/REQUIRE b/REQUIRE index decf7b2..bc7acb5 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,4 +1,4 @@ -julia 0.5 +julia 0.6- ModernGL GLAbstraction 0.3.1 diff --git a/src/GLWindow.jl b/src/GLWindow.jl index fa3d28d..02dd031 100755 --- a/src/GLWindow.jl +++ b/src/GLWindow.jl @@ -6,10 +6,10 @@ using ModernGL using GLAbstraction using GLFW using Reactive +using StaticArrays using GeometryTypes using ColorTypes using FixedPointNumbers -using FixedSizeArrays using Compat using FileIO diff --git a/src/events.jl b/src/events.jl index ba8d03b..174f338 100644 --- a/src/events.jl +++ b/src/events.jl @@ -95,19 +95,19 @@ Selection of random objects on the screen is realized by rendering an object id + plus an arbitrary index into the framebuffer. The index can be used for e.g. instanced geometries. """ -immutable SelectionID{T <: Integer} <: FixedVectorNoTuple{2, T} +immutable SelectionID{T <: Integer} <: FieldVector{T} id::T index::T - function SelectionID(args::NTuple{2, T}) - new{T}(args[1], args[2]) - end + # function SelectionID(args::NTuple{2, T}) + # new{T}(args[1], args[2]) + # end end begin global push_selectionqueries! -const selection_data = Array(SelectionID{UInt16}, 1, 1) -const old_mouse_position = Array(Vec{2, Float64}, 1) +const selection_data = Array{SelectionID{UInt16}, 2}(1, 1) +const old_mouse_position = Vector{Vec{2, Float64}}(1) function push_selectionqueries!(screen) mouse_position = value(mouseposition(screen))