tung-tea 0.1.5 → 0.2.0

data/doc/example/circle_alpha.rb

@@ -0,0 +1,43 @@
+# Test that alpha blending works for circles.
+# Expected results
+
+require 'tea'
+
+puts <<TEST
+You should see a white rectangle and circles along the edges:
+
+--b     --r     -ab
+
+-ar             o-b
+
+o-r     oab     oar
+
+o--   = outline
+-a-   = antialias
+--b/r = blend/replace
+
+Press any key to exit.
+TEST
+
+Tea.init
+Tea::Screen.set_mode 400, 300
+
+Tea::Screen.rect 100, 75, 200, 150, 0xffffffff
+
+Tea::Screen.circle 100,  75, 25, 0x00ff0080, :outline => false, :antialias => false, :mix => :blend
+Tea::Screen.circle 200,  75, 25, 0x00ff0080, :outline => false, :antialias => false, :mix => :replace
+Tea::Screen.circle 300,  75, 25, 0x00ff0080, :outline => false, :antialias => true,  :mix => :blend
+
+Tea::Screen.circle 100, 150, 25, 0x00ff0080, :outline => false, :antialias => true,  :mix => :replace
+Tea::Screen.circle 300, 150, 25, 0x00ff0080, :outline => true,  :antialias => false, :mix => :blend
+
+Tea::Screen.circle 100, 225, 25, 0x00ff0080, :outline => true,  :antialias => false, :mix => :replace
+Tea::Screen.circle 200, 225, 25, 0x00ff0080, :outline => true,  :antialias => true,  :mix => :blend
+Tea::Screen.circle 300, 225, 25, 0x00ff0080, :outline => true,  :antialias => true,  :mix => :replace
+
+Tea::Screen.update
+
+loop do
+  e = Tea::Event.get(true)
+  break if e.class == Tea::App::Exit || e.class == Tea::Kbd::Down
+end

data/doc/example/lines_alpha.rb

@@ -0,0 +1,29 @@
+# Test that line alpha mixes properly.
+# Expected results:
+#
+# * half-red background
+# * green line, translucent
+# * blue line, translucent
+# * white line, solid
+
+require 'tea'
+
+puts <<TEST
+You should see for 5 seconds:
+
+ * half-red background
+ * green line, translucent
+ * blue line, translucent
+ * white line, solid
+TEST
+
+Tea.init
+Tea::Screen.set_mode 400, 300
+
+Tea::Screen.rect 200, 0, 200, 300, 0xff0000ff
+20.times { |n| Tea::Screen.line 10,  10 + n, 390,  10 + n, 0x00ff0080 }
+20.times { |n| Tea::Screen.line 10, 100 + n, 390, 100 + n, 0x0000ff80, :mix => :blend }
+20.times { |n| Tea::Screen.line 10, 200 + n, 390, 200 + n, 0xffffff80, :mix => :replace }
+
+Tea::Screen.update
+sleep 5

data/doc/example/rect_alpha.rb

@@ -0,0 +1,30 @@
+# Test that alpha for rectangles works.
+# Expected results are:
+#
+# * center:                   red   rectangle (background)
+# * top-left:     translucent green rectangle
+# * bottom-left:  translucent white rectangle
+# * bottom-right: solid       blue  rectangle
+
+require 'tea'
+
+puts <<TEST
+You should see for 5 seconds:
+
+ * center:                   red   rectangle (background)
+ * top-left:     translucent green rectangle
+ * bottom-left:  translucent white rectangle
+ * bottom-right: solid       blue  rectangle
+TEST
+
+Tea.init
+Tea::Screen.set_mode 400, 300
+
+Tea::Screen.rect 100,  75, 200, 150, 0xff0000ff
+Tea::Screen.rect   0,   0, 200, 150, 0x00ff0080, :mix => :blend
+Tea::Screen.rect 200, 150, 200, 150, 0x0000ff80, :mix => :replace
+Tea::Screen.rect   0, 150, 200, 150, 0xffffff80
+
+Tea::Screen.update
+
+sleep 5

data/doc/reference.textile

@@ -28,9 +28,9 @@ Tea::Blitting:
 Tea::PrimitiveDrawing:
 * clear()
 * point(x, y, color)
-* rect(x, y, w, h, color)
-* line(x1, y1, x2, y2, color[, {:antialias => false}])
-* circle(x, y, radius, color[, {:outline => false, :antialias => false}])
+* rect(x, y, w, h, color[, {:mix => :blend (alt. :replace)}])
+* line(x1, y1, x2, y2, color[, {:antialias => false, :mix => :blend (alt. :replace)}])
+* circle(x, y, radius, color[, {:outline => false, :antialias => false, :mix => :blend (alt. :replace)}])
 
 Note that colours are of the form 0xRRGGBBAA.
 
@@ -65,9 +65,9 @@ Tea::Blitting:
 Tea::PrimitiveDrawing:
 * clear()
 * point(x, y, color)
-* rect(x, y, w, h, color)
-* line(x1, y1, x2, y2, color[, {:antialias => false}])
-* circle(x, y, radius, color[, {:outline => false, :antialias => false}])
+* rect(x, y, w, h, color[, {:mix => :blend (alt. :replace)}])
+* line(x1, y1, x2, y2, color[, {:antialias => false, :mix => :blend (alt. :replace)}])
+* circle(x, y, radius, color[, {:outline => false, :antialias => false, :mix => :blend (alt. :replace)}])
 
 Note that colours are of the form 0xRRGGBBAA.
 

data/lib/tea/c_bitmap.rb

@@ -74,16 +74,15 @@ module Tea
         raise Tea::Error, "can't create bitmap smaller than 1x1 (#{width}x#{height})", caller
       end
 
-      # Default to little endian pixel format, because it's what Intel uses,
-      # and Intel arches are common.
-      rmask = 0x000000ff
-      gmask = 0x0000ff00
-      bmask = 0x00ff0000
-      amask = 0xff000000
-      @buffer = SDL::Surface.new(SDL::SWSURFACE | SDL::SRCALPHA,
+      # Default to big endian, as it works better with SGE's anti-aliasing.
+      rmask = 0xff000000
+      gmask = 0x00ff0000
+      bmask = 0x0000ff00
+      amask = 0x000000ff
+      @buffer = SDL::Surface.new(SDL::SWSURFACE,
                                  width, height, 32,
                                  rmask, gmask, bmask, amask)
-      rect 0, 0, w, h, color
+      rect 0, 0, w, h, color, :mix => :replace
 
       # Optimise for the screen mode, now or later.
       if Tea::Screen.mode_set?

data/lib/tea/m_primitive_drawing.rb

@@ -39,24 +39,68 @@ module Tea
     end
 
     # Draw a rectangle of size w * h with the top-left corner at (x, y) with
-    # the given color (0xRRGGBBAA).
+    # the given color (0xRRGGBBAA).  Hash arguments that can be used:
     #
-    # Raises Tea::Error if w or h are less than 0.
-    def rect(x, y, w, h, color)
-      if w < 0 || h < 0
+    # +:mix+::    +:blend+ averages the RGB parts the rectangle and destination
+    #             colours according to the colour's alpha (default).
+    #             +:replace+ writes over the full RGBA parts of the rectangle
+    #             area's pixels.
+    #
+    # Raises Tea::Error if w or h are less than 0, or if +:mix+ is given an
+    # unrecognised symbol.
+    def rect(x, y, w, h, color, options=nil)
+      if w < 0 || h < 0 || (options && options[:mix] == :blend && (w < 1 || h < 1))
         raise Tea::Error, "can't draw rectangle of size #{w}x#{h}", caller
       end
-      primitive_buffer.fill_rect x, y, w, h, primitive_color(color)
+
+      if options == nil || options[:mix] == nil
+        mix = :blend
+      else
+        unless [:blend, :replace].include?(options[:mix])
+          raise Tea::Error, "invalid mix option \"#{options[:mix]}\"", caller
+        end
+        mix = options[:mix]
+      end
+
+      case mix
+      when :blend
+        r, g, b, a = primitive_hex_to_rgba(color)
+        # draw_rect has an off-by-one error with the width and height, hence the "- 1"s.
+        return if w < 1 || h < 1
+        primitive_buffer.draw_rect x, y, w - 1, h - 1, primitive_rgba_to_color(r, g, b, 255), true, a
+      when :replace
+        primitive_buffer.fill_rect x, y, w, h, primitive_color(color)
+      end
     end
 
     # Draw a line from (x1, y1) to (x2, y2) with the given color (0xRRGGBBAA).
     # Optional hash arguments:
     #
     # +:antialias+::    If true, smooth the line with antialiasing.
+    # +:mix+::          +:blend+ averages the RGB parts of the line and
+    #                   destination colours by the line alpha (default).
+    #                   +:replace+ writes over the RGBA parts of the line
+    #                   destination pixels.
     def line(x1, y1, x2, y2, color, options=nil)
-      primitive_buffer.draw_line x1, y1, x2, y2,
-                                 primitive_color(color),
-                                 (options[:antialias] if options)
+      if options == nil
+        aa = false
+        mix = :blend
+      else
+        aa = options[:antialias] || false
+        mix = options[:mix] || :blend
+
+        unless [:blend, :replace].include?(mix)
+          raise Tea::Error, "invalid mix option \"#{mix}\"", caller
+        end
+      end
+
+      case mix
+      when :blend
+        r, g, b, a = primitive_hex_to_rgba(color)
+        primitive_buffer.draw_line x1, y1, x2, y2, primitive_rgba_to_color(r, g, b, 255), aa, a
+      when :replace
+        primitive_buffer.draw_line x1, y1, x2, y2, primitive_color(color), aa
+      end
     end
 
     # Draw a circle centred at (x, y) with the given radius and color
@@ -65,18 +109,52 @@ module Tea
     # +:outline+::    If true, do not fill the circle, just draw an outline.
     # +:antialias+::  If true, smooth the edges of the circle with
     #                 antialiasing.
+    # +:mix+::        +:blend+ averages the RGB parts of the circle and
+    #                 destination colours by the colour's alpha (default).
+    #                 +:replace+ writes over the RGBA parts of the circle's
+    #                 destination pixels.
     #
-    # Raises Tea::Error if the radius is less than 0.
+    # Raises Tea::Error if the radius is less than 0, or :mix is given an
+    # unrecognised symbol.
     def circle(x, y, radius, color, options=nil)
       if radius < 0
         raise Tea::Error, "can't draw circle with radius #{radius}", caller
       end
 
-      if options
-        primitive_buffer.draw_circle x, y, radius, primitive_color(color),
-                                     !options[:outline], options[:antialias]
+      if options == nil
+        outline = false
+        antialias = false
+        mix = :blend
       else
-        primitive_buffer.draw_circle x, y, radius, primitive_color(color), true
+        outline = options[:outline] || false
+        antialias = options[:antialias] || false
+        mix = options[:mix] || :blend
+
+        unless [:blend, :replace].include?(mix)
+          raise Tea::Error, "invalid mix option \"#{mix}\"", caller
+        end
+      end
+
+      case mix
+      when :blend
+        r, g, b, a = primitive_hex_to_rgba(color)
+        if !outline && antialias && a < 255
+          # rubysdl can't draw filled antialiased alpha circles for some reason.
+          # Big endian because the SGE-powered circle antialiasing apparently
+          # doesn't like it any other way.
+          ts = SDL::Surface.new(SDL::SWSURFACE, (radius + 1) * 2, (radius + 1) * 2, 32,
+                                0xff000000,
+                                0x00ff0000,
+                                0x0000ff00,
+                                0x000000ff)
+          ts.draw_circle radius + 1, radius + 1, radius, ts.map_rgba(r, g, b, a), true, true
+          SDL::Surface.blit ts, 0, 0, ts.w, ts.h, primitive_buffer, x - radius - 1, y - radius - 1
+        else
+          primitive_buffer.draw_circle x, y, radius, primitive_rgba_to_color(r, g, b, 255),
+                                       !outline, antialias, (a == 255 ? nil : a)
+        end
+      when :replace
+        primitive_buffer.draw_circle x, y, radius, primitive_color(color), !outline, antialias
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tung-tea
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tung Nguyen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,14 +37,17 @@ files:
 - doc/example/bitmap_draw.rb
 - doc/example/bitmap_load.rb
 - doc/example/bitmap_new.rb
-- doc/example/circles.rb
+- doc/example/circle.rb
+- doc/example/circle_alpha.rb
 - doc/example/event_app.rb
 - doc/example/event_keyboard.rb
 - doc/example/event_mouse.rb
 - doc/example/init.rb
 - doc/example/lines.rb
+- doc/example/lines_alpha.rb
 - doc/example/point.rb
 - doc/example/rect.rb
+- doc/example/rect_alpha.rb
 - doc/example/screen_set_mode.rb
 - doc/example/screen_update.rb
 - doc/example/smile.png