lib/rubygoo/adapters/gosu_render_adapter.rb in rubygoo-0.0.5 vs lib/rubygoo/adapters/gosu_render_adapter.rb in rubygoo-0.0.6

@@ -1,35 +1,62 @@
 module Rubygoo
+  class DelayedText
+    def initialize(font, text)
+      @font, @text = font, text
+    end
+    def draw(x, y, z, r, g, b); @font.draw(@text, x, y, z); end; 
+    def width()
+      @width ||= @font.text_width(@text).ceil
+    end
+    def height()
+      @height ||= @font.height
+    end
+  end
+
   class GosuRenderAdapter
 
     def initialize(window)
       @window = window
     end
 
-    def draw_box_filled(x1,y1,x2,y2,color)
-      c = convert_color(color)
-      @window.draw_quad x1, y1, c, x2, y1, c, x1, y2, c, x2, y2, c
-    end
-
     def draw_box(x1,y1,x2,y2,color)
       c = convert_color(color)
       @window.draw_line x1, y1, c, x2, y1, c
       @window.draw_line x2, y1, c, x2, y2, c
       @window.draw_line x2, y2, c, x1, y2, c
       @window.draw_line x1, y2, c, x1, y1, c
     end
 
-    # fill in a rect with color or full screen if no color
-    def fill(color,rect=nil)
-      if rect.nil? 
-        draw_box_filled 0, 0, @window.width, @window.height, color
-      else
-        draw_box_filled rect[0], rect[1], rect[2]+rect[0], rect[3]+rect[1], color
-      end
+    CIRCLE_STEP = 10
+    def draw_circle(cx,cy,r,color)
+      c_color = convert_color(color)
+      
+      0.step(360, CIRCLE_STEP) { |a1| 
+        a2 = a1 + CIRCLE_STEP
+        @window.draw_line cx + offset_x(a1, r), cy + offset_y(a1, r), c_color, cx + offset_x(a2, r), cy + offset_y(a2, r), c_color, 0 
+      }
     end
 
-    # make static for now for migration ease of rendering fonts
+    def draw_circle_filled(cx,cy,r,color)
+      c_color = convert_color(color)
+
+      0.step(360, CIRCLE_STEP) { |a1| 
+        a2 = a1 + CIRCLE_STEP
+        @window.draw_triangle cx + offset_x(a1, r), cy + offset_y(a1, r), c_color, cx + offset_x(a2, r), cy + offset_y(a2, r), c_color, cx, cy, c_color, 0 
+      }
+    end
+
+    def fill_screen(color)
+      c = convert_color(color)
+      @window.draw_quad 0, 0, c, @window.width, 0, c, 0, @window.height, c, @window.width, @window.height, c
+    end
+
+    def fill(x1,y1,x2,y2,color)
+      c = convert_color(color)
+      @window.draw_quad x1, y1, c, x2, y1, c, x1, y2, c, x2, y2, c
+    end
+
     def convert_color(goo_color)
       Gosu::Color.new goo_color.a,goo_color.r,goo_color.g,goo_color.b
     end
 
     def start_drawing(); end
@@ -37,13 +64,13 @@
     def finish_drawing(); end
 
     def draw_image(img, x, y, color=nil)
       # z is unused here
       if color
-        img.draw x, y, 1,1,1,convert_color(color)
+        img.draw x, y, 0,1,1,convert_color(color)
       else
-        img.draw x, y, 1
+        img.draw x, y, 0
       end
     end
 
     def size_text(text, font_file, font_size)
       @font_cache ||= {}
@@ -57,11 +84,12 @@
       @font_cache ||= {}
       @font_cache[font_file] ||= {}
       font = @font_cache[font_file][font_size] ||= Font.new(@window, font_file, font_size)
 
       # TODO how do you set the color here?
-      text_image = Image.from_text(@window, text, font_file, font_size, 2, font.text_width(text).ceil+text.length*2, :left)
+#      text_image = Image.from_text(@window, text, font_file, font_size, 2, font.text_width(text).ceil, :left)
+      DelayedText.new font, text
+#      text_image = font.draw(text, 0, 0, 1)
     end
-
 
   end
 end