Added a line of documentation for #shape. Changed examples to use #sh…

…ape.
jashkenas · Jan 11, 2010 · 64ae921 · 64ae921
1 parent b51de4d
commit 64ae921
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/lib/ruby-processing/app.rb b/lib/ruby-processing/app.rb
@@ -254,6 +254,7 @@ def grid(cols, rows, col_size=1, row_size=1)
       end
     end
 
+    # Shortcut for begin_shape/end_shape pair
     def shape(*mode)
       begin_shape *mode
       yield

diff --git a/samples/processing_app/3D/form/brick_tower.rb b/samples/processing_app/3D/form/brick_tower.rb
@@ -77,9 +77,9 @@ def initialize(width, height, depth)
 
   def create
     @vertices.each do |name, vectors|
-      begin_shape App::QUADS
-      vectors.each {|v| vertex(v.x, v.y, v.z) }
-      end_shape
+      shape(App::QUADS) do
+        vectors.each {|v| vertex(v.x, v.y, v.z) }
+      end
     end
   end
 

diff --git a/samples/processing_app/basics/form/triangle_strip.rb b/samples/processing_app/basics/form/triangle_strip.rb
@@ -23,19 +23,19 @@ def setup
     number_of_points = 36
     rotation = 360.0/number_of_points
 
-    begin_shape TRIANGLE_STRIP
-    number_of_points.times do |i|
-      px = x + cos(angle.radians)*outer_radius
-		  py = y + sin(angle.radians)*outer_radius
-		  angle += rotation
-		  vertex px, py
+    shape(TRIANGLE_STRIP) do
+      number_of_points.times do |i|
+        px = x + cos(angle.radians)*outer_radius
+  		  py = y + sin(angle.radians)*outer_radius
+  		  angle += rotation
+  		  vertex px, py
 
-		  px = x + cos(angle.radians)*inner_radius
-		  py = y + sin(angle.radians)*inner_radius
-		  angle += rotation
-		  vertex px, py
+  		  px = x + cos(angle.radians)*inner_radius
+  		  py = y + sin(angle.radians)*inner_radius
+  		  angle += rotation
+  		  vertex px, py
+      end
     end
-    end_shape
   end
 
 end