lib/extensions/kernel.rb lib/player/joint.rb lib/player/joint/angles.yml @@ -12,10 +12,13 @@ module Client def connect @thread = Thread.new do - Client::Socket.open Server do |socket| + Socket.open Server do |socket| loop do - socket.puts Player.commands.shift unless Player.commands.empty? - Player.data = Client::Mapper.new Client::Parser.run socket.gets + unless Player.commands.empty? + socket.puts Player.commands.join("\n") + Player.commands.clear + end + Player.data = Mapper.new Parser.run socket.gets end end end lib/client.rb @@ -1,5 +1,7 @@ +require 'extensions/kernel' + require 'player/observable' -require 'player/joints' +require 'player/joint' require 'player/pose' require 'player/movement' @@ -7,6 +9,6 @@ module Player extend self attr_reader :commands, :data + @data = {} @commands = [] - @data = {} end \ No newline at end of file lib/player.rb @@ -1,26 +1,41 @@ module Player + # TODO: think about reimplementing - def data=(new_data) - notify :new_cycle, new_data + def data=(new_data) + notify :before_every_cycle, new_data + old_data = data.clone data.merge!(new_data) do |perceptor, old_value, new_value| notify(perceptor, old_value, new_value) unless old_value == new_value new_value end + notify :after_every_cycle, old_data end @observers = Hash.new {|hash, new_perceptor| hash[new_perceptor] = {} } @callbacks = Hash.new {|hash, new_perceptor| hash[new_perceptor] = [] } - def every_cycle(&callback) - @callbacks[:new_cycle] << callback + def after_every_cycle(name=nil, &callback) + if name + @observers[:after_every_cycle][name] = callback + else + @callbacks[:after_every_cycle] << callback + end end - def add_callback(perceptor, &observer) - @callbacks[perceptor] << observer + def before_every_cycle(name=nil, &callback) + if name + @observers[:before_every_cycle][name] = callback + else + @callbacks[:before_every_cycle] << callback + end + end + + def add_callback(perceptor, &callback) + @callbacks[perceptor] << callback end - def add_observer(perceptor, name, &observer) - @observers[perceptor][name] = observer + def add_observer(perceptor, name, &callback) + @observers[perceptor][name] = callback end def remove_observer(perceptor, name) lib/player/observable.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -# TODO: move to the vendor +# TODO: move external dependencies like rawline to the vendor folder require 'rubygems' # TODO: print suggestion to install gem termios to make raw_console faster on *nix require 'rawline' @@ -29,7 +29,8 @@ editor.bind(:ctrl_a) do editor.write_line "Completion info:\n #{editor.completion_proc.call(word).join ' '}" end -editor.completion_proc = proc {|word| Player.effectors.values.select {|it| it.include? word }} +# TODO: fix to get a list of effectors from the right place +# editor.completion_proc = proc {|word| Player.effectors.values.select {|it| it.include? word }} editor.completion_append_string = ' ' Client::Socket.open SERVER do |socket| script/raw_console lib/extensions/loader.rb lib/player/joints.rb lib/player/joints/angles.yml 260216612e41e71e33037191098eaf646182b95a brainopia ravwar@gmail.com http://github.com/brainopia/robocup-client/commit/c04724c4eb3efcef6dde51f668eb4bd3606e761f c04724c4eb3efcef6dde51f668eb4bd3606e761f 2009-05-16T08:28:09-07:00 2009-05-16T08:28:09-07:00 Completely revamp joint system 89e7f83aa9b3db314ea888cc661f66a45a85501c brainopia ravwar@gmail.com