@@ -64,18 +64,16 @@ class CharactersStrings < Processing::App def key_pressed # The variable "key" always contains the value of the most recent key pressed. # If the key is an upper or lowercase letter between 'A' and 'z' - # the image is shifted to the corresponding value of that key - - if (key >= "A"[0]) and (key <= "z"[0]) # should become "A".ord and "z".ord in Ruby 1.9 - + # the image is shifted to the corresponding value of that key + if ('A'..'z').include? key + # Map the index of the key pressed from the range between 'A' and 'z', # into a position for the left edge of the image. The maximum xoffset # is the width of the drawing area minus the size of the image. - - @xoffset = map( key, "A"[0], "z"[0], 0, width - @frog.width ).to_i + @xoffset = map( key[0], "A"[0], "z"[0], 0, width - @frog.width ).to_i # Update the letter shown to the screen - @letter = key.chr + @letter = key # Write the letter to the console puts key samples/processing_app/basics/data/characters_strings/characters_strings.rb @@ -17,17 +17,11 @@ class Keyboard < Processing::App end def draw - if key_pressed? - if key >= ("A"[0]) && key <= ("z"[0]) - if key <= ("Z"[0]) - @key_index = key - ("A"[0]) - else - @key_index = key - ("a"[0]) - end + if key_pressed? && ('A'..'z').include?(key) + @key_index = key.ord - (key <= 'Z' ? 'A'.ord : 'a'.ord) fill millis % 255 begin_rect = @rect_width/2 + @key_index * @key_scale - @rect_width/2 rect begin_rect, 0, @rect_width, height - end end end samples/processing_app/basics/input/keyboard.rb @@ -17,11 +17,11 @@ class Keyboard2 < Processing::App def draw if key_pressed? - if key.chr && key.chr >= "A" && key.chr <= "z" # added testing 'gainst Nil - if key.chr <= "Z" - @key_index = key - "A".ord + if ('A'..'z').include? key + if key <= "Z" + @key_index = key.ord - "A".ord else - @key_index = key - "a".ord + @key_index = key.ord - "a".ord end fill millis % 255 begin_rect = @rect_width/2 + @key_index * @key_scale - @rect_width/2 samples/processing_app/basics/input/keyboard_2.rb @@ -28,14 +28,14 @@ class KeyboardFunctions < Processing::App def draw if new_letter? if upcase? - fill (key - "A".ord).abs % 255 + fill (key.ord - "A".ord).abs % 255 rect @x, @y, @letter_width, @letter_height*2 else # clear with letter space with background color fill @num_chars/2 rect @x, @y, @letter_width, @letter_height - fill (key - "a".ord).abs % 255 + fill (key.ord - "a".ord).abs % 255 rect @x, @y+@letter_height, @letter_width, @letter_height end @new_letter = false @@ -51,26 +51,17 @@ class KeyboardFunctions < Processing::App end def key_pressed - # Try to get a String for int value in "key" - key_char = nil - key_char = key.chr rescue nil - - # if the key is between 'A'(65) and 'z'(122) - if key_char && key_char >= "A" && key_char <= "z" - if key_char <= "Z" - @upcase = true - else - @upcase = false - end + if ('A'..'z').include? key + @upcase = key <= "Z" + @new_letter = true + + # Update the "letter" position and + # wrap horizontally and vertically + @y += (@letter_height*2) if @x + @letter_width >= width + @y = @y % height + @x += @letter_width + @x = @x % width end - @new_letter = true - - # Update the "letter" position and - # wrap horizontally and vertically - @y += (@letter_height*2) if @x + @letter_width >= width - @y = @y % height - @x += @letter_width - @x = @x % width end end samples/processing_app/basics/input/keyboard_functions.rb db4a7ea6dabf20b1327a61d49a0cb1a2d86d9595 Jeremy Ashkenas jashkenas@gmail.com http://github.com/jashkenas/ruby-processing/commit/e8f2b576380ffa682f82d856980be9c6f29b3d1f e8f2b576380ffa682f82d856980be9c6f29b3d1f 2009-10-06T07:05:55-07:00 2009-10-06T07:05:55-07:00 fixing broken samples that were expecting key() to return an integer instead of a character a01a3440841b2d30d9eb0356d3b44e72e929daa1 Jeremy Ashkenas jashkenas@gmail.com