Skip to content
This repository has been archived by the owner on Apr 28, 2021. It is now read-only.

Switch to StaticArrays and fix 0.6 #42

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
julia 0.5
julia 0.6-

ModernGL
GLAbstraction 0.3.1
Expand Down
2 changes: 1 addition & 1 deletion src/GLWindow.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions src/events.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down