texplay 0.2.800-i386-mswin32 → 0.2.900-i386-mswin32

data/lib/texplay-contrib.rb

@@ -1,171 +1,171 @@
-begin
-    require 'rubygems'
-rescue LoadError
-end
-
-require 'texplay'
-
-# to bring in String#each_char for 1.8
-if RUBY_VERSION =~ /1.8/
-    require 'jcode'
-end
-
-# setup will be executed straight after Gosu::Image instantiation
-TexPlay::on_setup do
-    @turtle_pos = TexPlay::TPPoint.new(width / 2, height / 2 )
-    @turtle_angle = 0
-end
-
-
-TexPlay::create_macro(:move_to) do |x, y|
-    capture { 
-        @turtle_pos.x = x
-        @turtle_pos.y = y
-    }
-end
-
-TexPlay::create_macro(:move_rel) do |dx, dy|
-    capture { 
-        @turtle_pos.x += dx
-        @turtle_pos.y += dy
-    }
-end
-
-TexPlay::create_macro(:line_to) do |x, y, *other|
-    capture { 
-        line(@turtle_pos.x, @turtle_pos.y, x, y, *other)
-
-        @turtle_pos.x, @turtle_pos.y = x, y
-    }
-end
-
-TexPlay::create_macro(:line_rel) do |dx, dy, *other|
-    capture { 
-        x = @turtle_pos.x + dx
-        y = @turtle_pos.y + dy
-
-        line(@turtle_pos.x, @turtle_pos.y, x, y, *other)
-
-        @turtle_pos.x, @turtle_pos.y = x, y
-    }
-end
-
-TexPlay::create_macro(:turn_to) do |a|
-    capture {
-        @turtle_angle = a
-    }
-end
-
-TexPlay::create_macro(:turn) do |da|
-    capture { 
-        @turtle_angle += da
-    }
-end
-
-TexPlay::create_macro(:forward) do |dist, *other|
-    capture {
-        visible = other.shift
-
-        radians_per_degree = 0.0174532925199433
-
-        x = @turtle_pos.x + dist * Math::cos(radians_per_degree * @turtle_angle)
-        y = @turtle_pos.y + dist * Math::sin(radians_per_degree * @turtle_angle)
-
-        if(visible) then
-            line_to(x, y, *other)
-        else
-            move_to(x, y)
-        end
-    }
-end
-
-# L-System code
-# adding LSystem class to TexPlay module
-class TexPlay::LSystem
-    def initialize(&block)
-        @rules = {}
-        
-        instance_eval(&block) if block
-    end
-    
-    def rule(new_rule)
-        @rules.merge!(new_rule)
-    end
-
-    def atom(new_atom)
-        @atom = new_atom
-    end
-
-    def angle(new_angle=nil)
-        return @angle if !new_angle
-        @angle = new_angle
-    end
-
-    def produce_string(order)
-        order = order[:order]
-        string = @atom.dup
-        
-        order.times do
-            i = 0
-            while(i < string.length)
-                sub = @rules[string[i, 1]]
-                
-                string[i] = sub if sub
-                
-                i += sub ? sub.length : 1
-            end
-        end
-        
-        string
-    end
-end
-
-# L-System macro
-TexPlay::create_macro(:lsystem) do |x, y, system, options|
-    capture {
-        theta = system.angle
-        turtle_stack = []
-        move_to(x, y)
-        line_length = options[:line_length] || 1
-        
-        system.produce_string(options).each_char do |v|
-                      
-            case v
-            when "F"
-                forward(line_length, true)
-            when "+"
-                turn(theta)
-            when "-"
-                turn(-theta)
-            when "["
-                turtle_stack.push([@turtle_pos.dup, @turtle_angle])
-            when "]"
-                @turtle_pos, @turtle_angle = turtle_stack.pop
-            end
-        end
-    }
-end
-
-# Scaling
-# uses nearest-neighbour
-TexPlay::create_macro(:splice_and_scale) do |img, cx, cy, *options|
-    options = options.first ? options.first : {}
-
-    options = {
-        :color_control => proc do |c1, c2, x, y|
-            factor = options[:factor] || 1
-            factor_x = options[:factor_x] || factor
-            factor_y = options[:factor_y] || factor
-
-            x = factor_x * (x - cx) + cx
-            y = factor_y * (y - cy) + cy
-           
-            rect x, y, x + factor_x, y + factor_y, :color => c2, :fill => true
-            :none
-        end
-    }.merge!(options)
-   
-    splice img, cx, cy, options
-
-    self
-end
+begin
+    require 'rubygems'
+rescue LoadError
+end
+
+require 'texplay'
+
+# to bring in String#each_char for 1.8
+if RUBY_VERSION =~ /1.8/
+    require 'jcode'
+end
+
+# setup will be executed straight after Gosu::Image instantiation
+TexPlay::on_setup do
+    @turtle_pos = TexPlay::TPPoint.new(width / 2, height / 2 )
+    @turtle_angle = 0
+end
+
+
+TexPlay::create_macro(:move_to) do |x, y|
+    capture { 
+        @turtle_pos.x = x
+        @turtle_pos.y = y
+    }
+end
+
+TexPlay::create_macro(:move_rel) do |dx, dy|
+    capture { 
+        @turtle_pos.x += dx
+        @turtle_pos.y += dy
+    }
+end
+
+TexPlay::create_macro(:line_to) do |x, y, *other|
+    capture { 
+        line(@turtle_pos.x, @turtle_pos.y, x, y, *other)
+
+        @turtle_pos.x, @turtle_pos.y = x, y
+    }
+end
+
+TexPlay::create_macro(:line_rel) do |dx, dy, *other|
+    capture { 
+        x = @turtle_pos.x + dx
+        y = @turtle_pos.y + dy
+
+        line(@turtle_pos.x, @turtle_pos.y, x, y, *other)
+
+        @turtle_pos.x, @turtle_pos.y = x, y
+    }
+end
+
+TexPlay::create_macro(:turn_to) do |a|
+    capture {
+        @turtle_angle = a
+    }
+end
+
+TexPlay::create_macro(:turn) do |da|
+    capture { 
+        @turtle_angle += da
+    }
+end
+
+TexPlay::create_macro(:forward) do |dist, *other|
+    capture {
+        visible = other.shift
+
+        radians_per_degree = 0.0174532925199433
+
+        x = @turtle_pos.x + dist * Math::cos(radians_per_degree * @turtle_angle)
+        y = @turtle_pos.y + dist * Math::sin(radians_per_degree * @turtle_angle)
+
+        if(visible) then
+            line_to(x, y, *other)
+        else
+            move_to(x, y)
+        end
+    }
+end
+
+# L-System code
+# adding LSystem class to TexPlay module
+class TexPlay::LSystem
+    def initialize(&block)
+        @rules = {}
+        
+        instance_eval(&block) if block
+    end
+    
+    def rule(new_rule)
+        @rules.merge!(new_rule)
+    end
+
+    def atom(new_atom)
+        @atom = new_atom
+    end
+
+    def angle(new_angle=nil)
+        return @angle if !new_angle
+        @angle = new_angle
+    end
+
+    def produce_string(order)
+        order = order[:order]
+        string = @atom.dup
+        
+        order.times do
+            i = 0
+            while(i < string.length)
+                sub = @rules[string[i, 1]]
+                
+                string[i] = sub if sub
+                
+                i += sub ? sub.length : 1
+            end
+        end
+        
+        string
+    end
+end
+
+# L-System macro
+TexPlay::create_macro(:lsystem) do |x, y, system, options|
+    capture {
+        theta = system.angle
+        turtle_stack = []
+        move_to(x, y)
+        line_length = options[:line_length] || 1
+        
+        system.produce_string(options).each_char do |v|
+                      
+            case v
+            when "F"
+                forward(line_length, true)
+            when "+"
+                turn(theta)
+            when "-"
+                turn(-theta)
+            when "["
+                turtle_stack.push([@turtle_pos.dup, @turtle_angle])
+            when "]"
+                @turtle_pos, @turtle_angle = turtle_stack.pop
+            end
+        end
+    }
+end
+
+# Scaling
+# uses nearest-neighbour
+TexPlay::create_macro(:splice_and_scale) do |img, cx, cy, *options|
+    options = options.first ? options.first : {}
+
+    options = {
+        :color_control => proc do |c1, c2, x, y|
+            factor = options[:factor] || 1
+            factor_x = options[:factor_x] || factor
+            factor_y = options[:factor_y] || factor
+
+            x = factor_x * (x - cx) + cx
+            y = factor_y * (y - cy) + cy
+           
+            rect x, y, x + factor_x, y + factor_y, :color => c2, :fill => true
+            :none
+        end
+    }.merge!(options)
+   
+    splice img, cx, cy, options
+
+    self
+end

data/lib/texplay.rb

@@ -1,137 +1,162 @@
-# (C) John Mair 2009, under the MIT licence
-
-begin
-    require 'rubygems'
-rescue LoadError
-end
-
-direc = File.dirname(__FILE__)
-
-# include gosu first
-require 'rbconfig'
-require 'gosu'
-require "#{direc}/texplay/version"
-
-module TexPlay
-    class << self
-        def on_setup(&block)
-            raise "need a block" if !block
-            
-            @__init_procs__ ||= []
-            @__init_procs__.push(block)
-        end
-
-        def setup(receiver)
-            if @__init_procs__ then
-                @__init_procs__.each do |init_proc|
-                    receiver.instance_eval(&init_proc)
-                end
-            end
-        end
-
-        def create_blank_image(window, width, height)
-            Gosu::Image.new(window, EmptyImageStub.new(width, height))
-        end
-
-        alias_method :create_image, :create_blank_image
-    end
-
-    module Colors
-        Red = [1, 0, 0, 1]
-        Green = [0, 1, 0, 1]
-        Blue = [0, 0, 1, 1]
-        Black = [0, 0, 0, 1]
-        White = [1, 1, 1, 1]
-        Grey = [0.5, 0.5, 0.5, 1]
-        Alpha = [0, 0, 0, 0]
-        Purple = [1, 0, 1, 1]
-        Yellow = [1, 1, 0, 1]
-        Cyan = [0, 1, 1, 1]
-        Orange = [1, 0.5, 0, 1]
-        Brown = [0.39, 0.26, 0.13, 1]
-        Turquoise = [1, 0.6, 0.8, 1]
-        Tyrian = [0.4, 0.007, 0.235, 1]
-    end
-    include Colors
-end
-
-# credit to philomory for this class
-class EmptyImageStub
-    def initialize(w, h)
-        @w, @h = w, h
-    end
-    
-    def to_blob
-        "\0" * @w * @h * 4
-    end
-    
-    def rows
-        @h
-    end
-    
-    def columns
-        @w
-    end
-end
-
-# bring in user-defined extensions to TexPlay
-direc = File.dirname(__FILE__)
-dlext = Config::CONFIG['DLEXT']
-begin
-    if RUBY_VERSION && RUBY_VERSION =~ /1.9/
-        require "#{direc}/1.9/texplay.#{dlext}"
-    else
-        require "#{direc}/1.8/texplay.#{dlext}"
-    end
-rescue LoadError => e
-    require "#{direc}/texplay.#{dlext}"
-end
-    
-require "#{direc}/texplay-contrib"
-
-# monkey patching the Gosu::Image class to add image manipulation functionality
-module Gosu
-    class Image
-
-        # bring in the TexPlay image manipulation methods
-        include TexPlay
-
-        attr_reader :__window__
-        
-        class << self 
-            alias_method :original_new, :new
-            
-            def new(*args, &block)
-
-                # invoke old behaviour
-                obj = original_new(*args, &block)
-
-                # refresh the TexPlay image cache
-                if obj.width <= (TexPlay::TP_MAX_QUAD_SIZE) &&
-                        obj.height <= (TexPlay::TP_MAX_QUAD_SIZE) && obj.quad_cached? then
-                    
-                    obj.refresh_cache
-                end
-
-                # run custom setup
-                TexPlay::setup(obj)
-
-                 obj.instance_variable_set(:@__window__, args.first)
-
-                # return the new image
-                obj
-            end
-        end
-    end
-end
-
-# a bug in ruby 1.8.6 rb_eval_string() means i must define this here (rather than in texplay.c)
-class Proc  
-    def __context__
-        eval('self', self.binding)
-    end
-end
-
-
-
-
+
+# (C) John Mair 2009, under the MIT licence
+
+begin
+    require 'rubygems'
+rescue LoadError
+end
+
+direc = File.dirname(__FILE__)
+
+# include gosu first
+require 'rbconfig'
+require 'gosu'
+require "#{direc}/texplay/version"
+
+module TexPlay
+    class << self
+        def on_setup(&block)
+            raise "need a block" if !block
+            
+            @__init_procs__ ||= []
+            @__init_procs__.push(block)
+        end
+
+        def setup(receiver)
+            if @__init_procs__ then
+                @__init_procs__.each do |init_proc|
+                    receiver.instance_eval(&init_proc)
+                end
+            end
+        end
+
+        def create_blank_image(window, width, height, options={})
+          options = { :color => [0, 0, 0, 0] }.merge!(options)
+          
+          img = Gosu::Image.new(window, EmptyImageStub.new(width, height))
+          img.rect 0, 0, img.width - 1, img.height - 1, :color => options[:color], :fill => true
+
+          img
+        end
+
+        alias_method :create_image, :create_blank_image
+    end
+
+    module Colors
+        Red = [1, 0, 0, 1]
+        Green = [0, 1, 0, 1]
+        Blue = [0, 0, 1, 1]
+        Black = [0, 0, 0, 1]
+        White = [1, 1, 1, 1]
+        Grey = [0.5, 0.5, 0.5, 1]
+        Alpha = [0, 0, 0, 0]
+        Purple = [1, 0, 1, 1]
+        Yellow = [1, 1, 0, 1]
+        Cyan = [0, 1, 1, 1]
+        Orange = [1, 0.5, 0, 1]
+        Brown = [0.39, 0.26, 0.13, 1]
+        Turquoise = [1, 0.6, 0.8, 1]
+        Tyrian = [0.4, 0.007, 0.235, 1]
+    end
+    include Colors
+end
+
+# credit to philomory for this class
+class EmptyImageStub
+    def initialize(w, h)
+        @w, @h = w, h
+    end
+    
+    def to_blob
+        "\0" * @w * @h * 4
+    end
+    
+    def rows
+        @h
+    end
+    
+    def columns
+        @w
+    end
+end
+
+# bring in user-defined extensions to TexPlay
+direc = File.dirname(__FILE__)
+dlext = Config::CONFIG['DLEXT']
+begin
+    if RUBY_VERSION && RUBY_VERSION =~ /1.9/
+        require "#{direc}/1.9/texplay.#{dlext}"
+    else
+        require "#{direc}/1.8/texplay.#{dlext}"
+    end
+rescue LoadError => e
+    require "#{direc}/texplay.#{dlext}"
+end
+    
+require "#{direc}/texplay-contrib"
+
+# monkey patching the Gosu::Image class to add image manipulation functionality
+module Gosu
+    class Image
+
+        # bring in the TexPlay image manipulation methods
+        include TexPlay
+
+        attr_reader :__window__
+        
+        class << self 
+            alias_method :original_new, :new
+            
+            def new(*args, &block)
+
+                # invoke old behaviour
+                obj = original_new(*args, &block)
+
+                prepare_image(*args, obj)
+            end
+            
+            alias_method :original_from_text, :from_text
+
+            def from_text(*args, &block)
+
+                # invoke old behaviour
+                obj = original_from_text(*args, &block)
+
+                prepare_image(*args, obj)
+            end
+
+            def prepare_image(*args, obj)
+
+                # refresh the TexPlay image cache
+                if obj.width <= (TexPlay::TP_MAX_QUAD_SIZE) &&
+                        obj.height <= (TexPlay::TP_MAX_QUAD_SIZE) && obj.quad_cached? then
+                    
+                    obj.refresh_cache
+                end
+
+                # run custom setup
+                TexPlay.setup(obj)
+
+                obj.instance_variable_set(:@__window__, args.first)
+
+                obj
+            end
+            
+            private :prepare_image
+        end
+
+        alias_method :rows, :height
+        alias_method :columns, :width             
+        end
+end
+
+# a bug in ruby 1.8.6 rb_eval_string() means i must define this here (rather than in texplay.c)
+class Proc  
+    def __context__
+        eval('self', self.binding)
+    end
+end
+
+
+
+