texplay 0.4.3 → 0.4.4.pre

data/lib/texplay/version.rb

@@ -1,3 +1,3 @@
-module TexPlay
-  VERSION = "0.4.3"
-end
+module TexPlay
+  VERSION = "0.4.4.pre"
+end

data/live/live.rb

@@ -1,85 +1,85 @@
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "#{direc}/../lib/texplay"
-require 'pry'
-
-WIDTH = 640
-HEIGHT = 480
-
-class Gosu::Image
-  attr_accessor :x, :y
-
-  alias_method :orig_init, :initialize
-  def initialize(*args)
-    @x = WIDTH / 2
-    @y = HEIGHT / 2
-    orig_init(*args)
-  end
-end
-
-class WinClass < Gosu::Window
-
-  class View
-    attr_accessor :zoom, :rotate
-
-    def initialize
-      @zoom = 1
-      @rotate = 0
-    end
-
-    def reset
-      @zoom = 1
-      @rotate = 0
-    end
-  end
-  
-  attr_reader :images, :view
-  
-  def initialize
-    super(WIDTH, HEIGHT, false)
-    Gosu.enable_undocumented_retrofication
-
-    @images = []
-    @view = View.new
-    @pry_instance = Pry.new :prompt => [Proc.new { "(live)> " }, Proc.new { "(live)* " }]
-    
-    @img = TexPlay.create_image(self, 200, 200)
-    @img.rect 0, 0, @img.width - 1, @img.height - 1
-    
-    images << @img
-    @binding = binding
-  end
-
-  def create_image(width, height, options={})
-    TexPlay.create_image(self, width, height, options)
-  end
-
-  def load_image(file)
-    Gosu::Image.new(self, file)
-  end
-
-  def show_image(image)
-    images << image
-  end
-
-  def hide_image(image)
-    images.delete(image)
-  end
-  
-  def draw
-    images.uniq!
-    images.each do |v|
-      v.draw_rot(v.x, v.y, 1, view.rotate, 0.5, 0.5, view.zoom, view.zoom)
-    end
-  end
-
-  def update
-    @pry_instance.rep(@binding)
-  end
-end
-
-w = WinClass.new
-
-w.show
-
+direc = File.dirname(__FILE__)
+
+require 'rubygems'
+require "#{direc}/../lib/texplay"
+require 'pry'
+
+WIDTH = 640
+HEIGHT = 480
+
+class Gosu::Image
+  attr_accessor :x, :y
+
+  alias_method :orig_init, :initialize
+  def initialize(*args)
+    @x = WIDTH / 2
+    @y = HEIGHT / 2
+    orig_init(*args)
+  end
+end
+
+class WinClass < Gosu::Window
+
+  class View
+    attr_accessor :zoom, :rotate
+
+    def initialize
+      @zoom = 1
+      @rotate = 0
+    end
+
+    def reset
+      @zoom = 1
+      @rotate = 0
+    end
+  end
+  
+  attr_reader :images, :view
+  
+  def initialize
+    super(WIDTH, HEIGHT, false)
+    Gosu.enable_undocumented_retrofication
+
+    @images = []
+    @view = View.new
+    @pry_instance = Pry.new :prompt => [Proc.new { "(live)> " }, Proc.new { "(live)* " }]
+    
+    @img = TexPlay.create_image(self, 200, 200)
+    @img.rect 0, 0, @img.width - 1, @img.height - 1
+    
+    images << @img
+    @binding = binding
+  end
+
+  def create_image(width, height, options={})
+    TexPlay.create_image(self, width, height, options)
+  end
+
+  def load_image(file)
+    Gosu::Image.new(self, file)
+  end
+
+  def show_image(image)
+    images << image
+  end
+
+  def hide_image(image)
+    images.delete(image)
+  end
+  
+  def draw
+    images.uniq!
+    images.each do |v|
+      v.draw_rot(v.x, v.y, 1, view.rotate, 0.5, 0.5, view.zoom, view.zoom)
+    end
+  end
+
+  def update
+    @pry_instance.rep(@binding)
+  end
+end
+
+w = WinClass.new
+
+w.show
+

data/test/image_spec.rb

@@ -1,45 +1,45 @@
-direc = File.dirname(__FILE__)
-
-require "#{direc}/../lib/texplay"
-
-class Module
-  public :remove_const
-end
-
-describe Gosu::Image do
-  before do
-    @window = Gosu::Window.new(640, 480, false)
-    NormalImageSize = [Gosu::MAX_TEXTURE_SIZE - 2, Gosu::MAX_TEXTURE_SIZE - 2]
-    TooLargeImageSize = [2000, 2000]
-  end
-
-  after do
-    Object.remove_const(:NormalImageSize)
-    Object.remove_const(:TooLargeImageSize)
-  end
-  
-  describe "Gosu::Image#new (patched by TexPlay)" do
-    describe "caching option" do
-      it "should not cache image if :caching => false" do
-        source_image = TexPlay.create_image(@window, *NormalImageSize)
-        source_image.quad_cached?.should == false
-
-        image = Gosu::Image.new(@window, source_image, :caching => false)
-        image.width.should == NormalImageSize[0]
-        image.height.should == NormalImageSize[1]
-
-        image.quad_cached?.should == false
-      end
-
-      it "should cache the image if :caching => true" do
-        source_image = TexPlay.create_image(@window, *NormalImageSize)
-
-        image = Gosu::Image.new(@window, source_image, :caching => true)
-        image.width.should == NormalImageSize[0]
-        image.height.should == NormalImageSize[1]
-
-        image.quad_cached?.should == true
-      end
-    end
-  end
-end
+direc = File.dirname(__FILE__)
+
+require "#{direc}/../lib/texplay"
+
+class Module
+  public :remove_const
+end
+
+describe Gosu::Image do
+  before do
+    @window = Gosu::Window.new(640, 480, false)
+    NormalImageSize = [Gosu::MAX_TEXTURE_SIZE - 2, Gosu::MAX_TEXTURE_SIZE - 2]
+    TooLargeImageSize = [2000, 2000]
+  end
+
+  after do
+    Object.remove_const(:NormalImageSize)
+    Object.remove_const(:TooLargeImageSize)
+  end
+  
+  describe "Gosu::Image#new (patched by TexPlay)" do
+    describe "caching option" do
+      it "should not cache image if :caching => false" do
+        source_image = TexPlay.create_image(@window, *NormalImageSize)
+        source_image.quad_cached?.should == false
+
+        image = Gosu::Image.new(@window, source_image, :caching => false)
+        image.width.should == NormalImageSize[0]
+        image.height.should == NormalImageSize[1]
+
+        image.quad_cached?.should == false
+      end
+
+      it "should cache the image if :caching => true" do
+        source_image = TexPlay.create_image(@window, *NormalImageSize)
+
+        image = Gosu::Image.new(@window, source_image, :caching => true)
+        image.width.should == NormalImageSize[0]
+        image.height.should == NormalImageSize[1]
+
+        image.quad_cached?.should == true
+      end
+    end
+  end
+end

data/test/texplay_spec.rb

@@ -1,144 +1,144 @@
-$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), '..', 'lib','texplay')
-direc = File.dirname(__FILE__)
-
-require "#{direc}/../lib/texplay"
-
-describe TexPlay do
-  described_class = TexPlay
-  
-  before do
-    @window = Gosu::Window.new(640, 480, false)
-  end
-
-  describe "#create_image" do
-    it "should create a blank image of the correct size" do
-      width, height = 30, 10
-      image = described_class.create_image(@window, width, height)
-
-      image.width.should == width
-      image.height.should == height
-
-      width.times do |x|
-        height.times do |y|
-          image.get_pixel(x, y).should == [0.0, 0.0, 0.0, 0.0]
-        end
-      end
-    end
-
-    it "should create a coloured image of the correct size" do
-      width, height = 10, 30
-      color = [1.0, 1.0, 0.0, 1.0]
-      image = described_class.create_image(@window, width, height, :color => color)
-
-      image.width.should == width
-      image.height.should == height
-
-      width.times do |x|
-        height.times do |y|
-          image.get_pixel(x, y).should == color
-        end
-      end
-    end
-
-    it "should raise an error if an image dimension is 0 or less" do
-      lambda { described_class.create_image(@window, 0, 0)}.should raise_error(ArgumentError)
-    end
-
-    # TODO: Should probably be an ArgumentError.
-    it "should raise an ArgumentError if the image would be too large" do
-      too_big = TexPlay::TP_MAX_QUAD_SIZE + 1
-      [[too_big, 5], [10, too_big], [too_big, too_big]].each do |width, height|
-        puts "WIDTH: #{width.inspect}, HEIGHT: #{height.inspect}"
-        lambda {
-          described_class.create_image(@window, width, height)
-        }.should raise_error(ArgumentError)
-      end
-    end
-  end
-
-  describe "#clear" do
-    it "should clear an image to the correct color" do
-      img = described_class.create_image(@window, 10, 10)
-      img.clear :color => :red
-      (0...img.width).each do |x|
-        (0...img.height).each do |y|
-          img.get_pixel(x,y).should == [1,0,0,1]
-        end
-      end
-    end
-  end
-
-  describe "#from_blob" do
-    # it "should create an image with the requested pixel data and size" do
-    #   # 4 x 3, with columns of red, blue, green, transparent.
-    #   gosu_colors = [[255, 0, 0, 255], [0, 255, 0, 255], [0, 0, 255, 255], [0, 0, 0, 0]]
-    #   texplay_colors = gosu_colors.map {|a| a.map {|c| c / 255.0 } }
-    #   width, height = gosu_colors.size, 3
-      
-    #   image = described_class.from_blob(@window, (gosu_colors * height).flatten.pack('C*'), width, height)
-
-    #   image.width.should == width
-    #   image.height.should == height
-
-    #   texplay_colors.each_with_index do |color, x|
-    #     3.times do |y|
-    #       image.get_pixel(x, y).should == color
-    #     end
-    #   end
-    # end
-
-    it "should raise an error if the image size is not correct for the blob data" do
-      lambda { described_class.from_blob(@window, [1, 1, 1, 1].pack("C*"), 2, 1) }.should raise_error(ArgumentError)
-    end
-
-    it "should raise an error if an image dimension is 0 or less" do
-      lambda { described_class.from_blob(@window, '', 0, 0) }.should raise_error(ArgumentError)
-    end
-  end
-
-  describe "alpha_blend" do
-    it "should alpha blend using source alpha and not fixing alpha" do
-      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 1]
-      img1.clear :color => [0, 0, 1, 0.5], :alpha_blend => :source
-      img1.get_pixel(5, 5).should == [0.5, 0, 0.5, 0.75]
-    end
-
-    it "hash params true and :source should be equivalent" do
-      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 1]
-      img2 = img1.dup
-      img1.clear :color => [0, 0, 1, 0.5], :alpha_blend => :source
-      img2.clear :color => [0, 0, 1, 0.5], :alpha_blend => true
-      
-      img1.get_pixel(5, 5).should == [0.5, 0, 0.5, 0.75]
-      img2.get_pixel(5, 5).should == [0.5, 0, 0.5, 0.75]
-    end
-
-    it "false or nil should prevent alpha blending" do
-      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 1]
-      img2 = img1.dup
-      img1.clear :color => [0, 0, 1, 0.5], :alpha_blend => false
-      img2.clear :color => [0, 0, 1, 0.5], :alpha_blend => nil
-      
-      img1.get_pixel(5, 5).should == [0, 0, 1, 0.5]
-      img2.get_pixel(5, 5).should == [0, 0, 1, 0.5]
-    end
-
-    it "should alpha blend using dest alpha and not fixing alpha" do
-      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 0.5]
-      img1.clear :color => [0, 0, 1, 1], :alpha_blend => :dest
-      img1.get_pixel(5, 5).should == [0.5, 0, 0.5, 0.75]
-    end
-
-    it "should alpha blend using source alpha and fixing alpha" do
-      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 1]
-      img1.clear :color => [0, 0, 1, 0.5], :alpha_blend => :source_with_fixed_alpha
-      img1.get_pixel(5, 5).should == [0.5, 0, 0.5, 1]
-    end
-
-    it "should alpha blend using dest alpha and fixing alpha" do
-      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 0.5]
-      img1.clear :color => [0, 0, 1, 1], :alpha_blend => :dest_with_fixed_alpha
-      img1.get_pixel(5, 5).should == [0.5, 0, 0.5, 0.5]
-    end
-  end
-end
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), '..', 'lib','texplay')
+direc = File.dirname(__FILE__)
+
+require "#{direc}/../lib/texplay"
+
+describe TexPlay do
+  described_class = TexPlay
+  
+  before do
+    @window = Gosu::Window.new(640, 480, false)
+  end
+
+  describe "#create_image" do
+    it "should create a blank image of the correct size" do
+      width, height = 30, 10
+      image = described_class.create_image(@window, width, height)
+
+      image.width.should == width
+      image.height.should == height
+
+      width.times do |x|
+        height.times do |y|
+          image.get_pixel(x, y).should == [0.0, 0.0, 0.0, 0.0]
+        end
+      end
+    end
+
+    it "should create a coloured image of the correct size" do
+      width, height = 10, 30
+      color = [1.0, 1.0, 0.0, 1.0]
+      image = described_class.create_image(@window, width, height, :color => color)
+
+      image.width.should == width
+      image.height.should == height
+
+      width.times do |x|
+        height.times do |y|
+          image.get_pixel(x, y).should == color
+        end
+      end
+    end
+
+    it "should raise an error if an image dimension is 0 or less" do
+      lambda { described_class.create_image(@window, 0, 0)}.should raise_error(ArgumentError)
+    end
+
+    # TODO: Should probably be an ArgumentError.
+    it "should raise an ArgumentError if the image would be too large" do
+      too_big = TexPlay::TP_MAX_QUAD_SIZE + 1
+      [[too_big, 5], [10, too_big], [too_big, too_big]].each do |width, height|
+        puts "WIDTH: #{width.inspect}, HEIGHT: #{height.inspect}"
+        lambda {
+          described_class.create_image(@window, width, height)
+        }.should raise_error(ArgumentError)
+      end
+    end
+  end
+
+  describe "#clear" do
+    it "should clear an image to the correct color" do
+      img = described_class.create_image(@window, 10, 10)
+      img.clear :color => :red
+      (0...img.width).each do |x|
+        (0...img.height).each do |y|
+          img.get_pixel(x,y).should == [1,0,0,1]
+        end
+      end
+    end
+  end
+
+  describe "#from_blob" do
+    # it "should create an image with the requested pixel data and size" do
+    #   # 4 x 3, with columns of red, blue, green, transparent.
+    #   gosu_colors = [[255, 0, 0, 255], [0, 255, 0, 255], [0, 0, 255, 255], [0, 0, 0, 0]]
+    #   texplay_colors = gosu_colors.map {|a| a.map {|c| c / 255.0 } }
+    #   width, height = gosu_colors.size, 3
+      
+    #   image = described_class.from_blob(@window, (gosu_colors * height).flatten.pack('C*'), width, height)
+
+    #   image.width.should == width
+    #   image.height.should == height
+
+    #   texplay_colors.each_with_index do |color, x|
+    #     3.times do |y|
+    #       image.get_pixel(x, y).should == color
+    #     end
+    #   end
+    # end
+
+    it "should raise an error if the image size is not correct for the blob data" do
+      lambda { described_class.from_blob(@window, [1, 1, 1, 1].pack("C*"), 2, 1) }.should raise_error(ArgumentError)
+    end
+
+    it "should raise an error if an image dimension is 0 or less" do
+      lambda { described_class.from_blob(@window, '', 0, 0) }.should raise_error(ArgumentError)
+    end
+  end
+
+  describe "alpha_blend" do
+    it "should alpha blend using source alpha and not fixing alpha" do
+      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 1]
+      img1.clear :color => [0, 0, 1, 0.5], :alpha_blend => :source
+      img1.get_pixel(5, 5).should == [0.5, 0, 0.5, 0.75]
+    end
+
+    it "hash params true and :source should be equivalent" do
+      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 1]
+      img2 = img1.dup
+      img1.clear :color => [0, 0, 1, 0.5], :alpha_blend => :source
+      img2.clear :color => [0, 0, 1, 0.5], :alpha_blend => true
+      
+      img1.get_pixel(5, 5).should == [0.5, 0, 0.5, 0.75]
+      img2.get_pixel(5, 5).should == [0.5, 0, 0.5, 0.75]
+    end
+
+    it "false or nil should prevent alpha blending" do
+      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 1]
+      img2 = img1.dup
+      img1.clear :color => [0, 0, 1, 0.5], :alpha_blend => false
+      img2.clear :color => [0, 0, 1, 0.5], :alpha_blend => nil
+      
+      img1.get_pixel(5, 5).should == [0, 0, 1, 0.5]
+      img2.get_pixel(5, 5).should == [0, 0, 1, 0.5]
+    end
+
+    it "should alpha blend using dest alpha and not fixing alpha" do
+      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 0.5]
+      img1.clear :color => [0, 0, 1, 1], :alpha_blend => :dest
+      img1.get_pixel(5, 5).should == [0.5, 0, 0.5, 0.75]
+    end
+
+    it "should alpha blend using source alpha and fixing alpha" do
+      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 1]
+      img1.clear :color => [0, 0, 1, 0.5], :alpha_blend => :source_with_fixed_alpha
+      img1.get_pixel(5, 5).should == [0.5, 0, 0.5, 1]
+    end
+
+    it "should alpha blend using dest alpha and fixing alpha" do
+      img1 = described_class.create_image(@window, 10, 10).clear :color => [1, 0, 0, 0.5]
+      img1.clear :color => [0, 0, 1, 1], :alpha_blend => :dest_with_fixed_alpha
+      img1.get_pixel(5, 5).should == [0.5, 0, 0.5, 0.5]
+    end
+  end
+end