Merge branch 'master' of git://github.com/JuliaGL/GLVisualize.jl

Author: SimonDanisch

examples/tests/minimal_test.jl

@@ -251,8 +251,8 @@ function insert_selectionquery!(name::Symbol, value::Rectangle)
 end
 function insert_selectionquery!(name::Symbol, value::Signal{Rectangle{Int}})
     const_lift(value) do v
-    SELECTION_QUERIES[name] = v
-    end
+        SELECTION_QUERIES[name] = v
+    end |> preserve
     SELECTION[name]         = Input(Array(Vec{2, Int}, value.value.w, value.value.h))
     SELECTION[name]
 end
@@ -290,7 +290,7 @@ bounce{T}(range::Range{T}; t=TIMER_SIGNAL) =
 
 insert_selectionquery!(:mouse_hover, const_lift(ROOT_SCREEN.inputs[:mouseposition]) do mpos
     Rectangle{Int}(round(Int, mpos[1]), round(Int, mpos[2]), 1,1)
-end)
+end |> preserve)
 
 
 global const RENDER_FRAMEBUFFER = glGenFramebuffers()
@@ -318,7 +318,8 @@ const_lift(ROOT_SCREEN.inputs[:framebuffer_size]) do window_size
         glBindRenderbuffer(GL_RENDERBUFFER, rboDepthStencil[1])
         glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT32, (window_size)...)
     end
-end
+end |> preserve
+
 function postprocess(screen_texture, screen)
     data = merge(Dict(
         :resolution => const_lift(Vec2f0, screen.inputs[:framebuffer_size]),

src/camera.jl

@@ -153,7 +153,7 @@ function cubecamera(
     robj = visualize(p, model=model, preferred_camera=:cube_cam)
     start_colors = p.attributes
     color_tex    = robj[:attributes]
-    const_lift(cubeside_color, id, h, Input(start_colors), Input(color_tex))
+    preserve(const_lift(cubeside_color, id, h, Input(start_colors), Input(color_tex)))
 
     push!(id, robj.id)
     view(robj, cubescreen);

src/display/renderloop.jl

@@ -14,7 +14,7 @@ insert_selectionquery(value, selectionquery, name) = selectionquery[name] = valu
 
 
 function insert_selectionquery!(name::Symbol, value::Signal{Rectangle{Int}}, selection, selectionquery)
-    const_lift(insert_selectionquery, value, selectionquery, name)
+    preserve(const_lift(insert_selectionquery, value, selectionquery, name))
     selection[name]  = Input(Array(Vec{2, Int}, value.value.w, value.value.h))
     selection[name]
 end
@@ -69,7 +69,7 @@ function GLFramebuffer(framebuffsize::Signal{Vec{2, Int}})
     glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT32, buffersize...)
     glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, db)
     fb = GLFramebuffer(render_framebuffer, color_buffer, objectid_buffer, db)
-    const_lift(resizebuffers, framebuffsize, fb)
+    preserve(const_lift(resizebuffers, framebuffsize, fb))
     fb
 end
 

src/edit/line_edit.jl

@@ -50,7 +50,7 @@ function edit_line(
     drag0, index0   = mousedrag_index.value
 	diff_signal = foldl(mouse_drag_diff, (index0, Vec2f0(0), drag0), mousedrag_index)
 	diff_signal = droprepeats(const_lift(getindex, diff_signal, 1:2)) #throw away drag, tmp
-	const_lift(gpu_diff_set!, point_gpu, diff_signal, direction_restriction, clampto)
+	preserve(const_lift(gpu_diff_set!, point_gpu, diff_signal, direction_restriction, clampto))
 	points[:visible] = lift(OR, hovering_lines, hovering_points)
 	Context(line_robj, points), diff_signal
 end
@@ -94,7 +94,7 @@ function vizzedit(colors::Vector{RGBA{U8}}, window)
     for i=1:4
         c_channel = points2f0(Float32[p.(i)*scale_factor for p in colors], range)
         c_i, diff = edit_line(c_channel, dir_restrict, (0, scale_factor), window, color=channel_color(i, 0.8f0))
-        const_lift(edit_color, color_tex, colors, diff, i, Float32(scale_factor))
+        preserve(const_lift(edit_color, color_tex, colors, diff, i, Float32(scale_factor)))
         push!(c, c_i)
     end
     c, color_tex

src/edit/numbers.jl

@@ -60,6 +60,6 @@ function vizzedit(range::Range, inputs, numberwidth=5; startvalue=middle(range))
     new_num = const_lift(slide, startvalue, addition_vec, range)
 
     new_num_gl = const_lift(num2glstring, new_num, numberwidth)
-    const_lift(update!, vizz[:glyphs], new_num_gl)
+    preserve(const_lift(update!, vizz[:glyphs], new_num_gl))
     return new_num, vizz
 end

src/utils.jl

@@ -20,7 +20,7 @@ macro visualize_gen(input, target, S)
 
         function visualize(signal::Signal{$input}, s::$S, customizations=visualize_default(signal.value, s))
             tex = $target(signal.value)
-            const_lift(update!, Input(tex), signal)
+            preserve(const_lift(update!, Input(tex), signal))
             visualize(tex, s, customizations)
         end
     end)
@@ -32,7 +32,7 @@ texture_or_scalar(x) = x
 texture_or_scalar(x::Array) = Texture(x)
 function texture_or_scalar{A <: Array}(x::Signal{A})
     tex = Texture(x.value)
-    const_lift(update!, tex, x)
+    preserve(const_lift(update!, tex, x))
     tex
 end
 

src/visualize/2dparticles.jl

@@ -17,7 +17,7 @@ visualize(locations::Vector{Point{2, Float32}}, s::Style, customizations=visuali
 
 function visualize(locations::Signal{Vector{Point2f0}}, s::Style, customizations=visualize_default(locations.value, s))
     start_val = texture_buffer(locations.value)
-    const_lift(update!, start_val, locations)
+    preserve(const_lift(update!, start_val, locations))
     visualize(start_val, s, customizations)
 end
 

src/visualize/colormap.jl

@@ -13,7 +13,7 @@ visualize{T <: Colorant}(img::Array{T, 1}, s::Style, customizations=visualize_de
 
 function visualize{T <: Colorant}(img::Signal{Array{T, 1}}, s::Style, customizations=visualize_default(img.value, s))
     tex = Texture(img.value)
-    lift(update!, tex, img)
+    preserve(map(update!, tex, img))
     visualize(tex, s, customizations)
 end
 

src/visualize/containers.jl

@@ -39,9 +39,9 @@ function visualize{T <: Composable}(list::Vector{T}, s::Style, customizations=vi
 	x_align = const_lift(first, const_lift(minimum, bb_s))
 	for elem in list[2:end]
 		bb_s 		 = boundingbox(elem)
-		transformation(elem, const_lift(list_translation, y_start, x_align, bb_s))
+		transformation(elem, preserve(const_lift(list_translation, y_start, x_align, bb_s)))
 		y_width 	 = const_lift(y_coord, const_lift(width, bb_s))
 		y_start 	 = const_lift(-, y_start, const_lift(+, y_width, gap))
 	end
 	Context(list...)
-end
+end

src/visualize/image.jl

@@ -11,7 +11,7 @@ visualize{T <: Colorant}(img::Array{T, 2}, s::Style, customizations=visualize_de
 
 function visualize{T <: Colorant}(img::Signal{Array{T, 2}}, s::Style, customizations=visualize_default(img.value, s))
     tex = Texture(img.value)
-    const_lift(update!, tex, img)
+    preserve(const_lift(update!, tex, img))
     visualize(tex, s, customizations)
 end