From ee46a7b181fb550eb29d996a4bd9e7a12a635500 Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Wed, 30 Nov 2016 11:37:59 +0100 Subject: [PATCH 1/3] fixes for switch to static arrays --- src/GLWindow.jl | 2 +- src/events.jl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/GLWindow.jl b/src/GLWindow.jl index b517921..0e946eb 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..b03ac41 100644 --- a/src/events.jl +++ b/src/events.jl @@ -95,12 +95,12 @@ 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 From e47c192d9fbe71348b8b256765250b7733e73013 Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Thu, 6 Apr 2017 12:03:20 +0200 Subject: [PATCH 2/3] fixes for 0.6 --- src/events.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/events.jl b/src/events.jl index b03ac41..174f338 100644 --- a/src/events.jl +++ b/src/events.jl @@ -106,8 +106,8 @@ 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)) From fdf1ab909c124bbfa15eff7d55ea125344189b23 Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Thu, 6 Apr 2017 15:29:35 +0200 Subject: [PATCH 3/3] drop 0.5 for StaticArrays --- REQUIRE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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