@@ -1,12 +1,12 @@ -require 'osc' -#module OSC -# class UDPSocket -# def initialize -# end -# def connect(a,b) -# end -# end -#end +#require 'osc' +module OSC + class UDPSocket + def initialize + end + def connect(a,b) + end + end +end helpers do class LC @@ -30,52 +30,46 @@ helpers do attr_writer :rgb def initialize(socket, opts=nil) - @sock = socket - @colour = opts[:colour] if opts.is_a?(Hash) && opts.has_key?(:colour) - @light = opts[:light].to_i if opts.is_a?(Hash) && opts.has_key?(:light) + @sock = socket + @rgb = opts[:rgb] @channels = opts[:channels] if opts.is_a?(Hash) && opts.has_key?(:channels) - @rgb = opts[:rgb] + @colour = opts[:colour] if opts.is_a?(Hash) && opts.has_key?(:colour) + @light = opts[:light].to_i if opts.is_a?(Hash) && opts.has_key?(:light) end def display count = 0 - colour_channel_hash.each do |c| - @sock.send OSC::Message.new("/dmx/#{@channels[@light][count]}/set", 'f', c), 0 + channel_data_from_rgb(color_as_rgb).each do |c| + #@sock.send OSC::Message.new("/dmx/#{@channels[@light][count]}/set", 'f', c), 0 count = count + 1 end self.to_s end def to_s - "Setting the color to #{@colour} for light #{@light}\n" + "Light #{@light} : rgb(#{self.to_css})\n" end def to_css - # color: rgb(51, 51, 51); - if @rgb.has_key?(@colour.to_sym) - "color:rgb(#{@rgb[@colour.to_sym].join(',')});" - else - c = @colour.gsub('rgb','').gsub('-',',') - "color:rgb(#{c});" - end + color_as_rgb.join(',') end private - def colour_channel_hash - return [] unless @rgb + def color_as_rgb + return [0,0,0] if @colour == 'off' + return [(rand * 255).to_i,(rand * 255).to_i,(rand * 255).to_i] if @colour == 'random' if @rgb.has_key?(@colour.to_sym) - c = @rgb[@colour.to_sym] + return @rgb[@colour.to_sym] else - c = @colour.gsub('rgb','').split('-') + return @colour.gsub('rgb','').split('-') end + end + def channel_data_from_rgb(d) data = [] - (1..3).each do |i| - data << '%.1f' % ((c[i-1].to_f/255.0 * 100.0).to_f / 100) - end - + (1..3).each {|i| data << '%.1f' % ((d[i-1].to_f/255.0 * 100.0).to_f / 100) } data end @@ -100,8 +94,8 @@ get %r{/(1|2|all)+/(rgb\d{0,3}-\d{0,3}-\d{0,3}|red|blue|green|random|off)+$} do lights = [params['captures'].first] lights = @lights if lights.include?('all') colour = params['captures'][1] - colour = 'rgb0-0-0' if colour == 'off' halt 404, 'Oh dear! I understand what you\'re saying' unless lights && colour + content_type 'text/plain', :charset => 'utf-8' LC.set_lights( :lights => lights, :colour => colour, app.rb @@ -3,18 +3,18 @@ <head profile="http://gmpg.org/xfn/11"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <head> -<title>7th floor Henry Wood House spotlights controller</title> +<title>7th floor HWH spotlights controller</title> </head> <body> <h1>HWH 7th floor spotlight proxy</h1> -This makes playing with the spotlights a sych. Hopefully the urls give a clue. +Makes playing with the spotlights a sych. The urls are all you need. <ul> -<li><code><a href="http://lights.local/all/red">http://lights.local/all/red</a></code></li> -<li><code><a href="http://lights.local/all/green">http://lights.local/all/green</a></code></li> -<li><code><a href="http://lights.local/all/blue">http://lights.local/all/blue</a></code></li> -<li><code><a href="http://lights.local/1/red">http://lights.local/1/red</a></code></li> -<li><code><a href="http://lights.local/2/blue">http://lights.local/2/blue</a></code></li> -<li><code><a href="http://lights.local/all/off">http://lights.local/all/off</a></code></li> +<li><code><a href="http://lights.local/all/red">http://lights.local/all/(red|green|blue)</a></code></li> +<li><code><a href="http://lights.local/1/red">http://lights.local/(all|1|2)/red</a></code></li> +<li><code><a href="http://lights.local/all/off">http://lights.local/(all|1|2)/off</a></code></li> +<li><code><a href="http://lights.local/all/random">http://lights.local/(all|1|2)/random</a></code></li> </ul> +Simple huh? +BEWARE: the lights will just queue if everyones trys at the same time </body> </html> views/index.erb aecbb137e8bf8954a73bdd9349775aa9321c060d Duncan Robertson duncan@whomwah.com http://github.com/whomwah/light-controller/commit/e40d770712e6d60c924d816ff67109a9bca831d2 e40d770712e6d60c924d816ff67109a9bca831d2

2009-04-23T14:12:07-07:00

all the urls work just fine now b54420df989812b5ffa0b7cb1896c56406d4c226 Duncan Robertson duncan@whomwah.com