texplay 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,8 @@
+11/9/09
+version 0.2.3
+* added Ruby 1.8.7 compatibility by modifying extconf.rb to define RUBY_19 macro
+* and modified compat.h to get rid of feature test (fails on 1.8.7)
+
 8/9/09
 version 0.2.2
 * fixed color_control bug, action_struct->color was being overwritten (now using a temp).

data/README.markdown

@@ -5,7 +5,7 @@
 INSTRUCTIONS 
 ============
 
-**TexPlay version 0.2.2**
+**TexPlay version 0.2.3**
 
 Gem installation:
 

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rake/clean'
 require 'rake/gempackagetask'
 
+TEXPLAY_VERSION = "0.2.3"
+
 $dlext = Config::CONFIG['DLEXT']
 
 CLEAN.include("src/*.#{$dlext}", "src/*.log", "src/*.o", "src/*~", "src/*#*", "src/*.obj", "src/*.def", "src/*.pdb")
@@ -38,7 +40,7 @@ end
 specification = Gem::Specification.new do |s|
     s.name = "texplay"
     s.summary = "TexPlay is a light-weight image manipulation framework for Ruby and Gosu"
-    s.version = "0.2.2"
+    s.version = TEXPLAY_VERSION
     s.date = "2009-09-09"
     s.author = "John Mair (banisterfiend)"
     s.email = 'jrmair@gmail.com'
@@ -47,7 +49,7 @@ specification = Gem::Specification.new do |s|
     s.add_dependency("gosu",">=0.7.14")
     s.homepage = "http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/"
     s.has_rdoc = false
-    s.files =  ["Rakefile", "README.markdown", "CHANGELOG", "README1st",
+    s.files =  ["Rakefile", "README.markdown", "CHANGELOG", 
                 "lib/texplay.rb", "lib/texplay-contrib.rb"] +
         FileList["src/*", "examples/*.rb", "examples/media/*"].to_a 
 

data/examples/example_fill.rb

@@ -6,7 +6,7 @@ require 'texplay'
 class W < Gosu::Window
     def initialize
         super(1024, 768, false, 20)
-        @img = TexPlay::create_blank_image(self, 1022, 1022)
+        @img = TexPlay::create_blank_image(self, 1022, 800)
         @tp = Gosu::Image.new(self, "#{Common::MEDIA}/texplay.png")
         @gosu = Gosu::Image.new(self, "#{Common::MEDIA}/sand1.png")
 
@@ -25,7 +25,7 @@ class W < Gosu::Window
         @img.bezier points
 
         # NOTE: the :texture hash argument works on ALL drawing actions; not just fills
-        @img.fill 300, 600, :texture => @gosu
+        @img.fill 300, 650, :texture => @gosu
 
         # let's demonstrate by drawing a circle using the gosu.png texture
         # NOTE: :texture even works on lines, boxes, polylines, beziers etc. 

data/examples/example_lsystem.rb

@@ -0,0 +1,51 @@
+require 'common'
+require 'texplay'
+
+Dragon = TexPlay::LSystem.new do
+    rule "F" => "F"
+    rule "X" => "X+YF+"
+    rule "Y" => "-FX-Y"
+    angle 90
+
+    atom "FX"
+end
+
+Bush1 = TexPlay::LSystem.new do
+    rule "F" => "F[-F]F[+F][F]"
+    
+    angle 20
+    atom "F"
+end
+
+Bush2 = TexPlay::LSystem.new do
+    rule "F" => "FF"
+    rule "X" => "F[+X]F[-X]+X"
+    
+    angle 20
+    atom "X"
+end
+
+Bush3 = TexPlay::LSystem.new do
+    rule "F" => "FF"
+    rule "X" => "F-[[X]+X]+F[+FX]-X"
+    
+    angle 22.5
+    atom "X"
+end
+
+
+
+class W < Gosu::Window
+    def initialize
+        super(1024, 768, false, 20)
+        @img = TexPlay::create_blank_image(self, 800, 500)
+        @img.lsystem(250, 250, Dragon, :order => 13, :line_length => 2)
+    end
+
+    def draw
+        @img.draw(100,0,1)
+    end
+end
+
+w = W.new
+w.show

data/lib/texplay-contrib.rb

@@ -5,12 +5,22 @@ end
 
 require 'texplay'
 
+# monkey-patches to core classes
+class String
+    if !method_defined? :each_char
+        alias_method :_each_char,  :each_byte
+    else
+        alias_method :_each_char, :each_char
+    end
+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
@@ -73,5 +83,71 @@ TexPlay::create_macro(:forward) do |dist, *other|
     }
 end
 
+## L-System code
+
+# monkeypatches to TexPlay class
+module TexPlay
+    class 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
+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

data/lib/texplay.rb

@@ -10,7 +10,7 @@ require 'rbconfig'
 require 'gosu'
 
 module TexPlay
-    TEXPLAY_VERSION = "0.2.2"
+    TEXPLAY_VERSION = "0.2.3"
 
     def self::on_setup(&block)
         raise "need a block" if !block

data/src/Makefile

@@ -58,7 +58,7 @@ warnflags = -Wall -Wno-parentheses
 CFLAGS   =  -fPIC  $(cflags) 
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = -D_FILE_OFFSET_BITS=64
-CPPFLAGS =   $(DEFS) $(cppflags)
+CPPFLAGS =   $(DEFS) $(cppflags) -DRUBY_19
 CXXFLAGS = $(CFLAGS)  $(cxxflags)
 ldflags  = -L.  -rdynamic -Wl,-export-dynamic
 dldflags = 

data/src/compat.h

@@ -6,9 +6,13 @@
 #include <ruby.h>
 
 /* this is the test we use to identify ruby 1.9.1 */
+
+/* commenting out this test because it doesn't seem to work in 1.8.7 */
+/*
 #ifdef RCLASS_M_TBL
 # define RUBY_19
 #endif
+*/
 
 /* macros for backwards compatibility with 1.8 */
 #ifndef RUBY_19

data/src/extconf.rb

@@ -15,4 +15,7 @@ else
     exit unless have_library("glut32") 
 end
 
+# 1.9 compatibility
+$CPPFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /1.9/
+
 create_makefile('ctexplay')

data/src/utils.c

@@ -946,10 +946,26 @@ fact(int n)
 }
 
 unsigned
-comb(int n, int k)
+comb(int n, int r)
 {
-    double temp = fact(n) / (fact(k) * fact(n - k));
+    double temp = fact(n) / (fact(r) * fact(n - r));
     return temp;
+    /*    if(r > (n / 2))
+        r = n - r;
+    
+    return perm(n, r) / fact(r);
+    */
+}
+
+unsigned
+perm(int n, int r)
+{
+    int val = n;
+    int i;
+    for(i = n - 1; i > (n - r); i--)
+        val *= i;
+
+    return val;
 }
 
 double

data/src/utils.h

@@ -138,6 +138,8 @@ VALUE point_y(VALUE point);
 double power(float base, int exp);
 unsigned fact(int n);
 unsigned comb(int n, int k);
+unsigned perm(int n, int r);
+
 double bernstein(int n, int k, float u);
 
 #endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: texplay
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -34,7 +34,6 @@ files:
 - Rakefile
 - README.markdown
 - CHANGELOG
-- README1st
 - lib/texplay.rb
 - lib/texplay-contrib.rb
 - src/texplay.c
@@ -74,6 +73,7 @@ files:
 - examples/example_splice.rb
 - examples/example_alpha_blend.rb
 - examples/example_melt.rb
+- examples/example_lsystem.rb
 - examples/media/sand1.png
 - examples/media/rose.bmp
 - examples/media/maria.png

data/README1st

@@ -1,9 +0,0 @@
-INSTRUCTIONS
-
-TexPlay version 0.2.2
-
-*Ensure that ctexplay.so and gosu.so, and texplay.rb and texplay-contrib.rb are in the working directory for your project
-*require 'texplay' in your ruby program to access the TexPlay module
-*see example programs, for illustration of use
-
-