Merge 70b46b8 into 7bda78e

assets/shader/particles.vert

@@ -88,6 +88,7 @@ vec3 _scale(vec3 scale, Nothing scale_x, Nothing scale_y, Nothing scale_z, int i
 {{color_norm_type}} color_norm;
 // constant color!
 vec4 _color(vec4 color, Nothing intensity, Nothing color_map, Nothing color_norm, int index, int len);
+vec4 _color(vec3 color, Nothing intensity, Nothing color_map, Nothing color_norm, int index, int len);
 // only a samplerBuffer, this means we have a color per particle
 vec4 _color(samplerBuffer color, Nothing intensity, Nothing color_map, Nothing color_norm, int index, int len);
 // no color, but intensities a color map and color norm. Color will be based on intensity!

assets/shader/standard.frag

@@ -13,6 +13,10 @@ flat in uvec2 o_id;
 
 {{color_type}} color;
 
+vec4 get_color(vec3 color, vec2 uv){
+    return vec4(color, 1.0 + (0.0 * uv)); // we must prohibit uv from getting into dead variable removal
+}
+
 vec4 get_color(vec4 color, vec2 uv){
     return color + uv.x * 0.0; // we must prohibit uv from getting into dead variable removal
 }

examples/ExampleRunner.jl

@@ -10,7 +10,7 @@ module ExampleRunner
 using GLAbstraction, GLWindow, GLVisualize
 using FileIO, GeometryTypes, Reactive, Images
 export RunnerConfig
-import GLVisualize: toggle_button, slider, button, mm
+import GLVisualize: toggle_button, slider, button, mm, create_video_stream, add_frame!
 
 import Compat: String, UTF8String
 
@@ -19,7 +19,7 @@ include("mouse.jl")
 
 const installed_pkgs = Pkg.installed()
 
-const hasplots = get(installed_pkgs, "Plots", v"0") > v"0.9.3"
+const hasplots = false# get(installed_pkgs, "Plots", v"0") > v"0.9.3"
 const is_04 = VERSION.minor == 4
 
 if !hasplots
@@ -67,6 +67,7 @@ type RunnerConfig
     resampling
     screencast_folder
     record
+    record_image
     thumbnail
     rootscreen
     window
@@ -256,6 +257,7 @@ function RunnerConfig(;
         resampling = 0,
         screencast_folder = pwd(),
         record = true,
+        record_image = false,
         thumbnail = true,
         rootscreen = glscreen(resolution=resolution)
     )
@@ -290,6 +292,7 @@ function RunnerConfig(;
         resampling,
         screencast_folder,
         record,
+        record_image,
         thumbnail,
         rootscreen,
         view_screen,
@@ -414,7 +417,8 @@ import GLWindow: poll_reactive, poll_glfw, sleep_pessimistic
 
 function make_tests(config)
     i = 1; frames = 0; window = config.window; break_loop = false
-    runthrough = 0 # -1, backwards, 0 no running, 1 forward
+    # start in run through when recording images
+    runthrough = config.record_image ? 1 : 0 # -1, backwards, 0 no running, 1 forward
 
     function increase(x = runthrough)
         x = x == 0 ? 1 : x
@@ -444,14 +448,29 @@ function make_tests(config)
     end)
     failed = fill(false, length(config.files))
     Reactive.stop() # stop Reactive! We be pollin' ourselves!
+    io = nothing
     while i <= length(config.files) && isopen(config.rootscreen)
         path = config.files[i]
         try
             test_module = _test_include(path, config)
 
             display_msg(test_module, config)
             timings = Float64[]
-            frames = 0
+            frames = 0;
+            poll_glfw()
+            poll_reactive()
+            poll_reactive()
+            yield()
+
+            io, buffer = if config.record
+                name = basename(config.current_file)[1:end-3]
+                name = name * ".mkv"
+                name = joinpath(config.screencast_folder, name)
+                create_video_stream(name, config.rootscreen)
+            else
+                nothing, nothing
+            end
+
             while !break_loop && isopen(config.rootscreen)
                 tic()
                 poll_glfw()
@@ -460,13 +479,20 @@ function make_tests(config)
                     poll_reactive() # two times for secondary signals
                     render_frame(config.rootscreen)
                     swapbuffers(config.rootscreen)
-                    yield() # yield in timings? Seems fair
                 end
                 frames += 1
                 t = toq()
                 if length(timings) < 1000 && frames > 2
                     push!(timings, t)
                 end
+                if config.record_image
+                    name = basename(config.current_file)[1:end-3]
+                    name = joinpath(config.screencast_folder, name * ".png")
+                    GLWindow.screenshot(config.rootscreen, path = name)
+                    break
+                end
+                config.record && add_frame!(io, config.rootscreen, buffer)
+                yield() # yield in timings? Seems fair
                 GLWindow.sleep_pessimistic((1/60) - t)
                 (runthrough != 0 && frames > 20) && break
             end
@@ -489,6 +515,9 @@ function make_tests(config)
             config[:success] = false
             config[:exception] = ex
         finally
+            if config.record && io != nothing
+                close(io)
+            end
             empty!(window)
             empty!(config.buttons[:timesignal].actions)
             window.color = RGBA{Float32}(1,1,1,1)

examples/gui/buttons.jl

@@ -66,7 +66,7 @@ N = n1*n2
 args = map(value, (w[:a], w[:b], w[:c], w[:d]))
 v0 = lorenz(zeros(Point3f0, N), args...)
 positions = foldp(lorenz, v0, w[:a], w[:b], w[:c], w[:d])
-scales = const_lift(Vec3f0, w[:scale])
+scales = map(Vec3f0, w[:scale])
 rotations = map(diff, positions)
 rotations = map(x-> push!(x, x[end]), rotations)
 cmap = map((a,b)->[a,b], w[:colora], w[:colorb])

examples/plots/lines_scatter.jl

@@ -5,6 +5,8 @@ else
     (800, 500)
 end
 
+
+
 description = """
 Showing off different line types and marker types,
 like 3D meshes, characters and images.

src/StructsOfArrays.jl

@@ -6,6 +6,7 @@ immutable StructOfArrays{T,N,U<:Tuple} <: AbstractArray{T,N}
     arrays::U
 end
 
+
 type ScalarRepeat{T}
     scalar::T
 end