improve padded number format

Author: monkstone

samples/processing_app/topics/advanced_data/threads_two.rb

@@ -1,10 +1,14 @@
 ##################
 # From an original sketch on openprocessing by Chinchbug
 # http://www.openprocessing.org/sketch/29577
+#
+# Note: ruby syntax 'rjust' for padding a number string
 ##################
 FRAMES = 116
+IMG_F = 'a%s copy.jpg'
+MESS_F = 'loading frames (%s of 115)'
 
-attr_reader :ang, :curr, :frames, :done_loading
+attr_reader :ang, :curr, :frames
 
 def setup
   size(305, 395)
@@ -21,22 +25,21 @@ def setup
 def load_image_thread
   thread do     # supply a block in ruby-processing rather than use reflection
     FRAMES.times do |i|
-      frames << load_image("a#{i.to_s.rjust(3, '0')} copy.jpg") # ruby syntax
+      frames << load_image(format(IMG_F, i.to_s.rjust(3, '0')))
       @curr = i
-      delay(75) # just slows down this thread, the main draw cycle is unaffected
+      delay(75) # slows down this thread, the main draw cycle is unaffected
     end
     @curr = 0
     frame_rate(30)
-    @done_loading = true
   end
 end
 
 def draw
-  if done_loading
-    display_animation
-  else
+  if frames.length < FRAMES
     display_loading ang
     @ang += 0.1
+  else
+    display_animation
   end
 end
 
@@ -57,5 +60,5 @@ def display_loading(ang)
   fill(0)
   rect(120, 150, 170, 100)
   fill(128)
-  text("loading frames (#{curr} of 115)", 200, 200)
+  text(format(MESS_F, curr), 200, 200)
 end

samples/processing_app/topics/animation/animated_sprite.rb

@@ -1,57 +1,61 @@
 #
 # Animated Sprite (Shifty + Teddy)
-# by James Paterson, rubified by Martin Prout. 
-# 
+# by James Paterson, rubified by Martin Prout.
+#
 # Hold down the mouse button to change animations.
 # Demonstrates loading, displaying, and animating GIF images.
-# It would be easy to write a program to display 
-# animated GIFs, but would not allow as much control over 
-# the display sequence and rate of display. 
+# It would be easy to write a program to display
+# animated GIFs, but would not allow as much control over
+# the display sequence and rate of display.
 #
 
 DRAG = 30.0
+SHIFTY = 'PT_Shifty_%s.gif'
+TEDDY = 'PT_Teddy_%s.gif'
+
 attr_reader :xpos, :ypos, :animation1, :animation2
 
 def setup
   size(640, 360)
   background(255, 204, 0)
   frame_rate(24)
-  @animation1 = Animation.new('PT_Shifty_', 38)
-  @animation2 = Animation.new('PT_Teddy_', 60)
+  @animation1 = Animation.new(SHIFTY, 38)
+  @animation2 = Animation.new(TEDDY, 60)
   @ypos = height * 0.25
   @xpos = 0
 end
 
-def draw 
+def draw
   dx = mouse_x - xpos
   @xpos = xpos + dx / DRAG
   # Display the sprite at the position xpos, ypos
   if mouse_pressed?
     background(153, 153, 0)
-    animation1.display(xpos - animation1.get_width / 2, ypos)
+    animation1.display(xpos - animation1.image_width / 2, ypos)
   else
     background(255, 204, 0)
-    animation2.display(xpos - animation2.get_width / 2, ypos)
+    animation2.display(xpos - animation2.image_width / 2, ypos)
   end
 end
 
-class Animation 
-  attr_reader :images, :image_count, :frame
-  
-  def initialize(image_prefix, count)
-    @image_count = count
+# the animation class
+class Animation
+  attr_reader :images, :fcount, :frame
+
+  def initialize(image_format, count)
+    @fcount = count
     @frame = 0
-    @images = (0 ... image_count).map { 
-    |i| load_image(format('%s%04d%s', image_prefix, i, '.gif')) 
-    }
+    @images = (0...count).map do |i|
+      load_image(format(image_format, i.to_s.rjust(4, '0')))
+    end
   end
 
   def display(xpos, ypos)
-    @frame = (frame + 1) % image_count
+    @frame = (frame + 1) % fcount
     image(images[frame], xpos, ypos)
   end
-  
-  def get_width
+
+  def image_width
     images[0].width
   end
 end

samples/processing_app/topics/animation/sequential.rb

@@ -1,38 +1,30 @@
 #
 # Sequential
-# by James Paterson.  
-# 
-# Displaying a sequence of images creates the illusion of motion. 
-# Twelve images are loaded and each is displayed individually in a loop. 
+# by James Paterson.
+#
+# Displaying a sequence of images creates the illusion of motion.
+# Twelve images are loaded and each is displayed individually in a loop.
 #
 
 NUM_FRAMES = 12  # The number of frames in the animation
 attr_reader :frame, :images
 
+IMGFORM = 'PT_anim%s.gif'
+
 def setup
-  size(640, 360)
+  size(800, 360)
   frame_rate(24)
   @frame = 0
-  @images = []
-  images << load_image('PT_anim0000.gif')
-  images << load_image('PT_anim0001.gif')
-  images << load_image('PT_anim0002.gif')
-  images << load_image('PT_anim0003.gif')
-  images << load_image('PT_anim0004.gif')
-  images << load_image('PT_anim0005.gif')
-  images << load_image('PT_anim0006.gif')
-  images << load_image('PT_anim0007.gif')
-  images << load_image('PT_anim0008.gif')
-  images << load_image('PT_anim0009.gif')
-  images << load_image('PT_anim0010.gif')
-  images << load_image('PT_anim0011.gif')
+  @images = (0...NUM_FRAMES).map do |i|
+    load_image(format(IMGFORM, i.to_s.rjust(4, '0')))
+  end
 end
 
 def draw
   background(0)
   @frame = (frame + 1) % NUM_FRAMES  # Use % to cycle through frames
   offset = 0
-  (-100 ... width).step(images[0].width) do |i|
+  (-100...width).step(images[0].width) do |i|
     image(images[(frame + offset) % NUM_FRAMES], i, -20)
     offset += 2
     image(images[(frame + offset) % NUM_FRAMES], i, height / 2)