use Signal instead of Input. See JuliaGizmos/Reactive.jl#65

Author: SimonDanisch

examples/image_processing.jl

@@ -20,7 +20,7 @@ vec2i(vec::Vec) = vec2i(vec...)
 function screen(robj, w)
 	bb = boundingbox(robj).value
 	m = vec2i(bb.minimum)
-	area = Input(Rectangle{Int}(0,0, ((vec2i(bb.maximum)-m)+30)...))
+	area = Signal(Rectangle{Int}(0,0, ((vec2i(bb.maximum)-m)+30)...))
 	view(visualize(area, style=Cint(OUTLINED)), method=:fixed_pixel)
 	robj[:model] = translationmatrix(Vec3f0(15,15,0)-bb.minimum)
 	view(robj, method=:fixed_pixel)

examples/juliaset.jl

@@ -1,21 +1,48 @@
+meshgrid(v::AbstractVector) = meshgrid(v, v)
+
+function meshgrid{T}(vx::AbstractVector{T}, vy::AbstractVector{T})
+    m, n = length(vy), length(vx)
+    vx = reshape(vx, 1, n)
+    vy = reshape(vy, m, 1)
+    (repmat(vx, m, 1), repmat(vy, 1, n))
+end
+
+function meshgrid{T}(vx::AbstractVector{T}, vy::AbstractVector{T},
+                     vz::AbstractVector{T})
+    m, n, o = length(vy), length(vx), length(vz)
+    vx = reshape(vx, 1, n, 1)
+    vy = reshape(vy, m, 1, 1)
+    vz = reshape(vz, 1, 1, o)
+    om = ones(Int, m)
+    on = ones(Int, n)
+    oo = ones(Int, o)
+    (vx[om, :, oo], vy[:, on, oo], vz[om, on, :])
+end
+
 # Calculate the Julia set on a grid
-x = [Float32(i)*im for i=-1.5:0.5:500]
-y = [Float32(i)*im for i=-1:1:500]
+x,y = meshgrid(-1.5f0:0.5f0:500f0, -1f0:1f0:500f0)
+x *= 1im
+y *= 1im
 println(size(x))
 println(size(y))
 z = x + 1im * y
 
-julia = zeros(Float32, size(z))
+const julia = zeros(Float32, size(z))
 
 for i=1:50
-    z = z^2 - 0.70176 - 0.3842im
-    julia += 1 / 2f0 + i) * (z * conj(z) > 4)
+	for i in eachindex(julia)
+    	z[i] = (z[i]^2) - 0.70176 - 0.3842im
+    	x = (z[i] * (real(conj(z[i])) > 4))
+    	julia[i] += real(1f0 / (2f0 + i) * x)
+    end
 end
-
+maxval = maximum(julia)
+map!(julia ) do val 
+	val / maxval
+end
+using GLVisualize
+w,r =glscreen()
 # Display it
 view(visualize(julia))
 
-# A view into the "Canyon"
-view(65, 27, 322, [30., -13.7,  136])
-show()
-
+r()

examples/mario.jl

@@ -47,7 +47,7 @@ const mario_images = Dict()
 play{T}(array::Array{T, 3}, slice) = array[:, :, slice]
 
 
-signify{T}(x::Array{T, 2}) = Input(x)
+signify{T}(x::Array{T, 2}) = Signal(x)
 function signify{T}(x::Array{T, 3})
 	const_lift(play, x, loop(1:size(x, 3)))
 end

examples/tests/minimal_test.jl

@@ -188,8 +188,8 @@ function visualize_default(grid::Union{Texture{Float32, 2}, Matrix{Float32}})
         :grid_max   => grid_max,
         :scale      => scale,
         :norm       => Vec2f0(0, 5),
-        :model      	  => Input(eye(Mat4f0)),
-    	:light      	  => Input(Vec3f0[Vec3f0(1.0,1.0,1.0), Vec3f0(0.1,0.1,0.1), Vec3f0(0.9,0.9,0.9), Vec3f0(20,20,20)]),
+        :model      	  => Signal(eye(Mat4f0)),
+    	:light      	  => Signal(Vec3f0[Vec3f0(1.0,1.0,1.0), Vec3f0(0.1,0.1,0.1), Vec3f0(0.9,0.9,0.9), Vec3f0(20,20,20)]),
     	:preferred_camera => :perspective
     )
 end
@@ -207,9 +207,9 @@ function visualize(grid::Texture{Float32, 2}, customizations=visualize_default(g
         frag_shader
     )
     checkerror()
-    boundingbox = Input(AABB(Vec3f0(0), Vec3f0(1)))
+    boundingbox = Signal(AABB(Vec3f0(0), Vec3f0(1)))
 
-    robj = instanced_renderobject(data, Input(program), boundingbox, GL_TRIANGLES, grid)
+    robj = instanced_renderobject(data, Signal(program), boundingbox, GL_TRIANGLES, grid)
     checkerror()
     robj
 end
@@ -236,7 +236,7 @@ push!(ROOT_SCREEN.renderlist, robj2)
 push!(ROOT_SCREEN.renderlist, robj3)
 push!(ROOT_SCREEN.renderlist, robj4)
 
-const SELECTION         = Dict{Symbol, Input{Matrix{Vec{2, Int}}}}()
+const SELECTION         = Dict{Symbol, Signal{Matrix{Vec{2, Int}}}}()
 const SELECTION_QUERIES = Dict{Symbol, Rectangle{Int}}()
 immutable SelectionID{T}
     objectid::T
@@ -246,14 +246,14 @@ typealias GLSelection SelectionID{UInt16}
 typealias ISelection SelectionID{Int}
 function insert_selectionquery!(name::Symbol, value::Rectangle)
     SELECTION_QUERIES[name] = value
-    SELECTION[name]         = Input(Vec{2, Int}[]')
+    SELECTION[name]         = Signal(Vec{2, Int}[]')
     SELECTION[name]
 end
 function insert_selectionquery!(name::Symbol, value::Signal{Rectangle{Int}})
     const_lift(value) do v
         SELECTION_QUERIES[name] = v
     end |> preserve
-    SELECTION[name]         = Input(Array(Vec{2, Int}, value.value.w, value.value.h))
+    SELECTION[name]         = Signal(Array(Vec{2, Int}, value.value.w, value.value.h))
     SELECTION[name]
 end
 function delete_selectionquery!(name::Symbol)

examples/tests/nbody.jl

@@ -86,9 +86,9 @@ function send_frame(i, planets)
     reshape(p, (2,2))
 end
 
-const time_i = Input(1)
+const time_i = Signal(1)
 println(size(planets[:, 1]))
-const positions     = const_lift(send_frame, time_i, Input(planets))
+const positions     = const_lift(send_frame, time_i, Signal(planets))
 const robj          = visualize(positions, model=scalematrix(Vec3(0.1f0)))
 len = length(planets[:, 1])
 const planet_lines  = [visualize(reshape(planets[:, i], (250, 100)), particle_color=RGBA(rand(Float32,3)..., 0.4f0), model=scalematrix(Vec3(0.01f0))) for i=1:4]

examples/tests/test_color.jl

@@ -105,7 +105,7 @@ end
 const dragdiff_id = get_drag_diff(inputs)
 gizmo_dir = const_lift(/, const_lift(gizmodir_const_lift, dragdiff_id), 10f0)
 
-model 	= getmodel(Input(0f0), Input(0f0), Input(0f0), gizmo_dir)
+model 	= getmodel(Signal(0f0), Signal(0f0), Signal(0f0), gizmo_dir)
 
 
 msh 	= GLNormalMesh(file"cat.obj")

examples/tests/test_lines.jl

@@ -30,7 +30,7 @@ lines = std_renderobject(Dict(
 			:vertex           => GLBuffer(verts), #NOT WORKING
 			:index            => indexbuffer(indexes), #NOT WORKING
 			:projectionview   => GLVisualize.ROOT_SCREEN.perspectivecam.projectionview
-		), Input(lineshader), Input(AABB{Float32}(verts)), GL_LINES) #Input(AABB(verts)) -> calculates boundingbox
+		), Signal(lineshader), Signal(AABB{Float32}(verts)), GL_LINES) #Signal(AABB(verts)) -> calculates boundingbox
 
 push!(GLVisualize.ROOT_SCREEN.renderlist, lines)
 

examples/tests/test_particle2.jl

@@ -1,7 +1,7 @@
 using GLVisualize, AbstractGPUArray, GLAbstraction, GeometryTypes, Reactive, ColorTypes, Meshes, MeshIO
 
 # install a time varying signal
-const timer = Input(1)  
+const timer = Signal(1)  
 
 function mkCube(p::GeometryTypes.Point3{Float32}, hsz::Float32)
     cube    = GLNormalMesh( Cube( Vec3( p.x, p.y, p.z), Vec3(hsz)))

examples/tests/test_reactangle.jl

@@ -1,8 +1,8 @@
 using GLVisualize, GeometryTypes, GLAbstraction, Reactive, ColorTypes
 
 
-a = Input(Rectangle{Int64}(20,20,900,1000))
-b = Input(Rectangle{Int64}(960,0,960,1280))
+a = Signal(Rectangle{Int64}(20,20,900,1000))
+b = Signal(Rectangle{Int64}(960,0,960,1280))
 view(visualize(a, color=RGBA(1f0,0f0,1f0,0.5f0)))
 #view(visualize(b, color=RGBA(0f0,0f0,1f0,1f0)))
 

examples/tests/test_transformation.jl

@@ -104,7 +104,7 @@ end
 const dragdiff_id = get_drag_diff(inputs)
 gizmo_dir = const_lift(/, const_lift(gizmodir_const_lift, dragdiff_id), 10f0)
 
-model 	= getmodel(Input(0f0), Input(0f0), Input(0f0), gizmo_dir)
+model 	= getmodel(Signal(0f0), Signal(0f0), Signal(0f0), gizmo_dir)
 
 
 msh 	= GLNormalMesh(file"cat.obj")