hash key

Author: monkstone

demo/fire.rb

@@ -13,11 +13,11 @@
 # jruby fire.rb
 class Fire < Processing::App
   load_library :palette
-  
+
   def settings
     size 320, 240
   end
-  
+
   def setup
     sketch_title 'Fire'
     frame_rate 30
@@ -28,12 +28,12 @@ def setup
     @height = height / @scale
     @intensity = 2
   end
-  
+
   def draw
     background 0
     update_fire
   end
-  
+
   def update_fire
     random_line @height - 1
     (0..@height - 2).each do |y|
@@ -53,25 +53,25 @@ def update_fire
       end
     end
   end
-  
+
   def fire_data(x, y)
     @fire[offset(x, y)]
   end
-  
+
   def set_fire_data(x, y, value)
     @fire[offset(x, y)] = value.to_i
   end
-  
+
   def random_offset
     rand(0..@palette.size)
   end
-  
+
   def random_line(y)
     (0...@width).each do |x|
       @fire[offset(x, y)] = random_offset
     end
   end
-  
+
   def offset(x, y)
     (y * @width) + x
   end

library/vecmath/vec3d/terrain.rb

@@ -1,14 +1,6 @@
 #!/usr/bin/env jruby
 require 'picrate'
 
-# Alternative to using array or string as key
-Key = Struct.new(:x, :y) do
-  def eql?(key)
-    return false unless key.y == y
-    key.x == x
-  end
-end
-
 class Terrain < Processing::App
   WIDTH = 1400
   HEIGHT = 1100
@@ -20,7 +12,6 @@ def settings
   end
 
   def setup
-    sketch_title 'Terreno' # sketch_title doesn't work with P3D on PI
     @columns = WIDTH / SCL
     @rows = HEIGHT / SCL
     @terrain = {}
@@ -34,7 +25,7 @@ def draw
     (0..rows).each do |y|
       xoff = 0
       (0..columns).each do |x|
-        terrain[Key.new(x, y)] = Vec3D.new(x * SCL, y * SCL, map1d(noise(xoff, yoff), 0..1.0, -65..65))
+        terrain[hash_key(x, y)] = Vec3D.new(x * SCL, y * SCL, map1d(noise(xoff, yoff), 0..1.0, -65..65))
         xoff += 0.2
       end
       yoff += 0.2
@@ -47,15 +38,20 @@ def draw
     (0...rows).each do |y|
       begin_shape(TRIANGLE_STRIP)
       (0..columns).each do |x|
-        terrain[Key.new(x, y)].to_vertex(renderer)
-        terrain[Key.new(x, y.succ)].to_vertex(renderer)
+        terrain[hash_key(x, y)].to_vertex(renderer)
+        terrain[hash_key(x, y.succ)].to_vertex(renderer)
       end
       end_shape(CLOSE)
     end
   end
 
   private
 
+  # HACK should be safe here
+  def hash_key(x, y)
+    WIDTH * y + x
+  end
+
   def renderer
     @renderer ||= AppRender.new(self)
   end