texplay 0.2.1-x86-mswin32-60 → 0.2.2-x86-mswin32-60

data/src/Makefile

@@ -4,56 +4,76 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = c:/ruby/lib/ruby/1.8/i386-mswin32
-hdrdir = $(topdir)
-VPATH = $(srcdir);$(topdir);$(hdrdir)
+topdir = c:/ruby191/include/ruby-1.9.1
+hdrdir = c:/ruby191/include/ruby-1.9.1
+arch_hdrdir = c:/ruby191/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir);$(arch_hdrdir)/ruby;$(hdrdir)/ruby
 
 DESTDIR = c:
-prefix = $(DESTDIR)/ruby
+prefix = $(DESTDIR)/ruby191
 exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-archdir = $(rubylibdir)/$(arch)
+bindir = $(exec_prefix)/bin
 sbindir = $(exec_prefix)/sbin
+libexecdir = $(exec_prefix)/libexec
 datadir = $(prefix)/share
-includedir = $(prefix)/include
-infodir = $(prefix)/info
 sysconfdir = $(prefix)/etc
-mandir = $(prefix)/man
-libdir = $(exec_prefix)/lib
 sharedstatedir = $(DESTDIR)/etc
-oldincludedir = $(DESTDIR)/usr/include
-sitearchdir = $(sitelibdir)/$(sitearch)
 localstatedir = $(DESTDIR)/var
-bindir = $(exec_prefix)/bin
+libdir = $(exec_prefix)/lib
+includedir = $(prefix)/include
+oldincludedir = $(DESTDIR)/usr/include
+infodir = $(prefix)/info
+mandir = $(prefix)/man
+sitedir = $(prefix)/lib/$(RUBY_INSTALL_NAME)/site_ruby
+vendordir = $(prefix)/lib/$(RUBY_INSTALL_NAME)/vendor_ruby
+rubyhdrdir = $(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version)
+sitehdrdir = $(rubyhdrdir)/site_ruby
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+rubylibdir = $(libdir)/$(ruby_install_name)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 
 CC = cl -nologo
+CXX = $(CC)
 LIBRUBY = $(RUBY_SO_NAME).lib
 LIBRUBY_A = $(RUBY_SO_NAME)-static.lib
 LIBRUBYARG_SHARED = $(LIBRUBY)
 LIBRUBYARG_STATIC = $(LIBRUBY_A)
+OUTFLAG = -Fe
+COUTFLAG = -Fo
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -MD -Zi -O2b2xg- -G6 
-INCFLAGS = -I. -I. -Ic:/ruby/lib/ruby/1.8/i386-mswin32 -I.
+cflags   = 
+optflags = 
+debugflags = 
+warnflags = 
+CFLAGS   =  -MD -Zi  -O2b2xg- -G6 -Zm600 
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS =  
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS =  -link -incremental:no -debug -opt:ref -opt:icf -dll $(LIBPATH) -def:$(DEFFILE) -implib:$(*F:.so=)-$(arch).lib -pdb:$(*F:.so=)-$(arch).pdb 
+CPPFLAGS =    
+CXXFLAGS = $(CFLAGS) -MD -Zi  -O2b2xg- -G6 -Zm600
+ldflags  = -incremental:no -debug -opt:ref -opt:icf
+dldflags = -incremental:no -debug -opt:ref -opt:icf -dll $(LIBPATH)
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
 LDSHARED = cl -nologo -LD
+LDSHAREDXX = $(LDSHARED)
 AR = lib -nologo
 EXEEXT = .exe
 
 RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = msvcrt-ruby18
+RUBY_SO_NAME = msvcrt-ruby191
 arch = i386-mswin32
 sitearch = i386-msvcrt
-ruby_version = 1.8
-ruby = c:/ruby/bin/ruby
+ruby_version = 1.9.1
+ruby = c:/ruby191/bin/ruby
 RUBY = $(ruby:/=\)
 RM = $(RUBY) -run -e rm -- -f
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = $(RUBY) -run -e rmdir -- -p
 MAKEDIRS = @$(RUBY) -run -e mkdir -- -p
 INSTALL = @$(RUBY) -run -e install -- -vp
 INSTALL_PROG = $(INSTALL) -m 0755
@@ -70,6 +90,7 @@ DEFFILE = $(TARGET)-$(arch).def
 
 CLEANFILES = mkmf.log
 DISTCLEANFILES = vc*.pdb $(DEFFILE)
+DISTCLEANDIRS = 
 
 extout = 
 extout_prefix = 
@@ -83,25 +104,35 @@ DLLIB = $(TARGET).so
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.obj *.lib *.s[ol] *.pdb *.exp *.bak
+CLEANLIBS     = $(TARGET).so 
+CLEANOBJS     = *.obj $(TARGET).exp $(TARGET).lib $(TARGET).pdb *.bak
 
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
+all:    $(DLLIB)
+static: $(STATIC_LIB)
 
-clean:
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
 		@-$(RM) $(CLEANLIBS:/=\) $(CLEANOBJS:/=\) $(CLEANFILES:/=\)
 
-distclean:	clean
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
 		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES:/=\)
+		@-$(RMDIRS) $(DISTCLEANDIRS:/=\)
 
-realclean:	distclean
+realclean: distclean
 install: install-so install-rb
 
 install-so: $(RUBYARCHDIR)
@@ -121,61 +152,61 @@ site-install-rb: install-rb
 
 .SUFFIXES: .c .m .cc .cxx .cpp .obj
 
-{$(srcdir)}.cc{}.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+{$(hdrdir)}.cc.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
-{$(topdir)}.cc{}.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+{$(topdir)}.cc.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
-{$(hdrdir)}.cc{}.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+{$(srcdir)}.cc.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
 .cc.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
-{$(srcdir)}.cxx{}.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+{$(hdrdir)}.cxx.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
-{$(topdir)}.cxx{}.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+{$(topdir)}.cxx.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
-{$(hdrdir)}.cxx{}.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+{$(srcdir)}.cxx.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
 .cxx.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
-{$(srcdir)}.cpp{}.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+{$(hdrdir)}.cpp.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
-{$(topdir)}.cpp{}.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+{$(topdir)}.cpp.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
-{$(hdrdir)}.cpp{}.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+{$(srcdir)}.cpp.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
 .cpp.obj:
-	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
 
-{$(srcdir)}.c{}.obj:
-	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+{$(hdrdir)}.c.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
-{$(topdir)}.c{}.obj:
-	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+{$(topdir)}.c.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
-{$(hdrdir)}.c{}.obj:
-	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+{$(srcdir)}.c.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
 .c.obj:
-	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
-$(DLLIB): $(DEFFILE) $(OBJS)
-	@-$(RM) $@
-	$(LDSHARED) -Fe$(@) $(OBJS) $(LIBS) $(LOCAL_LIBS) $(DLDFLAGS)
+$(DLLIB): $(DEFFILE) $(OBJS) Makefile
+	@-$(RM) $(@:/=\)
+	$(LDSHARED) -Fe$(@) $(OBJS) $(LIBS) $(LOCAL_LIBS) -link $(DLDFLAGS) -implib:$(*F:.so=)-$(arch).lib -pdb:$(*F:.so=)-$(arch).pdb -def:$(DEFFILE)
 
 
 
 $(DEFFILE): 
 	$(RUBY) -e "puts 'EXPORTS', 'Init_$(TARGET)'"  > $@
 
-$(OBJS): {.;$(srcdir);$(topdir);$(hdrdir)}ruby.h {.;$(srcdir);$(topdir);$(hdrdir)}defines.h
+$(OBJS): {.;$(VPATH)}$(hdrdir)/ruby.h {.;$(VPATH)}$(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/src/actions.c

@@ -23,7 +23,6 @@ static void draw_epilogue(action_struct * cur, texture_info * tex, bool primary)
 
 static void prepare_fill_texture(action_struct * cur);
 static void prepare_color_control(action_struct * cur);
-static rgba exec_color_control_proc(action_struct * cur, texture_info * tex, int x, int y);
 static void set_pixel_color_with_style(action_struct * payload, texture_info * tex,
                                        int x, int y);
 /* end helpers */
@@ -225,12 +224,13 @@ ngon_do_action(int x, int y, int r, int num_sides, texture_info * tex, VALUE has
     int x1, y1, x2, y2, x0, y0;
     int n;
     int thickness;
+    float angle = 0;
 
     draw_prologue(&cur, tex, x - r, y - r,
                   x + r, y + r, &hash_arg, sync_mode, primary, &payload);
 
 
-    if(is_a_hash(hash_arg))
+    if(is_a_hash(hash_arg)) {
         if(RTEST(get_from_hash(hash_arg, "thickness"))) {
             thickness = NUM2INT(get_from_hash(hash_arg, "thickness"));
 
@@ -241,13 +241,18 @@ ngon_do_action(int x, int y, int r, int num_sides, texture_info * tex, VALUE has
             cur.ymax = y + r + thickness / 2;
         }
 
+        if(RTEST(get_from_hash(hash_arg, "start_angle"))) {
+            angle = NUM2INT(get_from_hash(hash_arg, "start_angle")) / 360.0 * 2 * PI;
+        }
+    }
+    
     /* calculate first point */
-    x0 = x1 = x + r;
-    y0 = y1 = y;
+    x0 = x1 = x + r * cos(angle);
+    y0 = y1 = y + r * sin(angle);
 
     for(n = 0; n < num_sides; n++) {
-        x2 = x + r * cos((2 * PI / num_sides) * n);
-        y2 = y + r * sin((2 * PI / num_sides) * n);
+        x2 = x + r * cos((2 * PI / num_sides) * n + angle);
+        y2 = y + r * sin((2 * PI / num_sides) * n + angle);
 
         line_do_action(x1, y1, x2, y2, tex, hash_arg, no_sync, false, payload);
 
@@ -919,10 +924,11 @@ splice_do_action(int x0, int y0, int cx1, int cy1, int cx2, int cy2, texture_inf
                 payload->color = get_pixel_color_from_chunk(image_buf, xbound, ybound, x, y);
                 
             if(has_chroma) {
-                bool cmp = cmp_color(payload->color, chromakey);
-                if(!cmp && !inverse_chroma)
-                    set_pixel_color_with_style(payload, tex, x0 + x, y0 + y);
-                else if(cmp && inverse_chroma)
+                bool chroma_match = cmp_color(payload->color, chromakey);
+                
+                /* look at released 0.2.0 code to see how USED to do this.
+                   this is now a simplified boolean expression */
+                if(chroma_match == inverse_chroma)
                     set_pixel_color_with_style(payload, tex, x0 + x, y0 + y);
             }
             else
@@ -1175,18 +1181,23 @@ prepare_color_control(action_struct * cur)
 }
 
 static rgba 
-exec_color_control_proc(action_struct * cur, texture_info * tex, int x, int y)
+exec_color_control_proc(action_struct * cur, texture_info * tex, int x, int y, rgba blended_pixel)
 {
     int arity = cur->pen.color_control_arity;
     VALUE proc = cur->pen.color_control_proc;
     rgba old_color = get_pixel_color(tex, x, y);
-    rgba current_color = cur->color;
+    rgba current_color = blended_pixel;
     rgba new_color;
 
     if(!cur->pen.has_color_control_proc)
         rb_raise(rb_eRuntimeError, "needs a proc");
 
     switch(arity) {
+    case -1:
+    case 0:
+        new_color = convert_rb_color_to_rgba(rb_funcall(proc, rb_intern("call"), 0));
+        break;
+        
     case 1:
         new_color = convert_rb_color_to_rgba(rb_funcall(proc, rb_intern("call"), arity,
                                                         convert_rgba_to_rb_color(&old_color)));
@@ -1231,20 +1242,57 @@ prepare_fill_texture(action_struct * payload)
     }
 }
 
-static void
+
+/* TODO: reimplement using SSE2 */
+static rgba
 apply_color_control_transform(action_struct * payload, texture_info * tex, int x, int y)
+                              
 {
-    payload->color = get_pixel_color(tex, x, y);
+    rgba transformed_color;
+    
+    transformed_color = get_pixel_color(tex, x, y);
         
-    payload->color.red += payload->pen.color_add.red; 
-    payload->color.green += payload->pen.color_add.green; 
-    payload->color.blue += payload->pen.color_add.blue; 
-    payload->color.alpha += payload->pen.color_add.alpha;
-
-    payload->color.red *= payload->pen.color_mult.red; 
-    payload->color.green *= payload->pen.color_mult.green; 
-    payload->color.blue *= payload->pen.color_mult.blue; 
-    payload->color.alpha *= payload->pen.color_mult.alpha;
+    transformed_color.red += payload->pen.color_add.red; 
+    transformed_color.green += payload->pen.color_add.green; 
+    transformed_color.blue += payload->pen.color_add.blue; 
+    transformed_color.alpha += payload->pen.color_add.alpha;
+
+    transformed_color.red *= payload->pen.color_mult.red; 
+    transformed_color.green *= payload->pen.color_mult.green; 
+    transformed_color.blue *= payload->pen.color_mult.blue; 
+    transformed_color.alpha *= payload->pen.color_mult.alpha;
+
+    return transformed_color;
+}
+
+static rgba
+apply_alpha_blend(action_struct * payload, texture_info * tex, int x, int y, rgba blended_pixel)
+{
+    rgba dest_pixel = get_pixel_color(tex, x, y);
+    rgba finished_pixel;
+
+
+    if(not_a_color(blended_pixel))
+        return blended_pixel;
+    
+    /* alpha blending is nothing more than a weighted average of src and dest pixels
+       based on source alpha value */
+    /* NB: destination alpha value is ignored */
+
+    /** TO DO: rewrite this using sse2 instructions **/
+    finished_pixel.red = blended_pixel.alpha * blended_pixel.red + (1 - blended_pixel.alpha)
+        * dest_pixel.red;
+
+    finished_pixel.green = blended_pixel.alpha * blended_pixel.green + (1 - blended_pixel.alpha)
+        * dest_pixel.green;
+
+    finished_pixel.blue = blended_pixel.alpha * blended_pixel.blue + (1 - blended_pixel.alpha)
+        * dest_pixel.blue;
+
+    finished_pixel.alpha = blended_pixel.alpha;
+    
+
+    return finished_pixel;
 }
 
 static void
@@ -1253,53 +1301,30 @@ set_pixel_color_with_style(action_struct * payload, texture_info * tex, int x, i
 
     rgba blended_pixel;
 
+    blended_pixel = payload->color;
+
     /* for color_control transform */
     if(payload->pen.has_color_control_transform)
-        apply_color_control_transform(payload, tex, x, y);
+        blended_pixel = apply_color_control_transform(payload, tex, x, y);
     
     /*    for texture fill  */
     if(payload->pen.has_source_texture)
-        payload->color = get_pixel_color(&payload->pen.source_tex,
+        blended_pixel = get_pixel_color(&payload->pen.source_tex,
                                          x % payload->pen.source_tex.width,
                                          y % payload->pen.source_tex.height);
 
     /* for color_control block */
     if(payload->pen.has_color_control_proc)
-        payload->color = exec_color_control_proc(payload, tex, x,  y);
+        blended_pixel = exec_color_control_proc(payload, tex, x,  y, blended_pixel);
     
 
     /*  TO DO: do bitwise pixel combinations here */
     
-    /* if i do not use blended_pixel and instead use payload->color in the
-       code below i get an interesting blurring effect in images (with alpha_blend => true)
-    */
-    blended_pixel = payload->color;
-    
-    
-    /*  alpha blending
-        TO DO: refactor into its own helper function
+    /*  TO DO: refactor into its own helper function
         & rewrite using sse2 */
-    if(payload->pen.alpha_blend) {
-        rgba dest_pixel = get_pixel_color(tex, x, y);
-            
-        /* alpha blending is nothing more than a weighted average of src and dest pixels
-           based on source alpha value */
-        /* NB: destination alpha value is ignored */
-        if(is_a_color(payload->color) && is_a_color(dest_pixel)) {
-
-            /** TO DO: rewrite this using sse2 instructions **/
-            blended_pixel.red = payload->color.alpha * payload->color.red + (1 - payload->color.alpha)
-                * dest_pixel.red;
-
-            blended_pixel.green = payload->color.alpha * payload->color.green + (1 - payload->color.alpha)
-                * dest_pixel.green;
-
-            blended_pixel.blue = payload->color.alpha * payload->color.blue + (1 - payload->color.alpha)
-                * dest_pixel.blue;
-
-            blended_pixel.alpha = payload->color.alpha;
-        }
-    }
+    if(payload->pen.alpha_blend)
+        blended_pixel = apply_alpha_blend(payload, tex, x,  y, blended_pixel);
+    
 
     set_pixel_color(&blended_pixel, tex, x, y);
 }

data/src/bindings.c

@@ -369,7 +369,7 @@ m_circle(int argc, VALUE * argv, VALUE self)
     
     ADJUST_SELF(self);
     
-    if(argc < 1) rb_raise(rb_eArgError, "circle action needs at least 1 parameter");
+    if(argc < 2) rb_raise(rb_eArgError, "circle action needs at least 2 parameter");
 
     process_x_y_pairs(self, 1, argv, &x1, &y1);
 
@@ -398,7 +398,7 @@ m_ngon(int argc, VALUE * argv, VALUE self)
 
     ADJUST_SELF(self);
     
-    if(argc < 4) rb_raise(rb_eArgError, "ngon requires at least 4 parameters (x, y, radius, num_sides)");
+    if(argc < 3) rb_raise(rb_eArgError, "ngon requires at least 3 parameters (x, y, radius, num_sides)");
 
     process_x_y_pairs(self, 1, argv, &x1, &y1);
 

data/src/mkmf.log

@@ -1,18 +1,33 @@
-have_library: checking for main() in glut32.lib... -------------------- yes
-
-"cl -nologo -Feconftest -I. -Ic:/ruby/lib/ruby/1.8/i386-mswin32 -I. -Ic:/ruby/lib/ruby/1.8/i386-mswin32  -MD -Zi -O2b2xg- -G6 conftest.c   msvcrt-ruby18-static.lib glut32.lib  oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib   -link    -libpath:"." -libpath:"c:/ruby/lib" -stack:0x2000000"
-conftest.c
-checked program was:
-/* begin */
-1: #define WIN32_LEAN_AND_MEAN
-2: #define WIN32
-3: #include <winsock2.h>
-4: #include <windows.h>
-5: 
-6: /*top*/
-7: int main() { return 0; }
-8: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-
+have_library: checking for main() in glut32.lib... -------------------- yes
+
+"cl -nologo -Feconftest -Ic:/ruby191/include/ruby-1.9.1/i386-mswin32 -Ic:/ruby191/include/ruby-1.9.1/ruby/backward -Ic:/ruby191/include/ruby-1.9.1 -I. -Ic:/ruby191/include/ruby-1.9.1    -MD -Zi  -O2b2xg- -G6 -Zm600 conftest.c   msvcrt-ruby191-static.lib  oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib   -link -incremental:no -debug -opt:ref -opt:icf   -libpath:"." -libpath:"c:/ruby191/lib" "
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #define WIN32_LEAN_AND_MEAN
+4: #define WIN32
+5: #include <winsock2.h>
+6: #include <ws2tcpip.h>
+7: #include <windows.h>
+8: int main() {return 0;}
+/* end */
+
+"cl -nologo -Feconftest -Ic:/ruby191/include/ruby-1.9.1/i386-mswin32 -Ic:/ruby191/include/ruby-1.9.1/ruby/backward -Ic:/ruby191/include/ruby-1.9.1 -I. -Ic:/ruby191/include/ruby-1.9.1    -MD -Zi  -O2b2xg- -G6 -Zm600 conftest.c   msvcrt-ruby191-static.lib glut32.lib  oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib   -link -incremental:no -debug -opt:ref -opt:icf   -libpath:"." -libpath:"c:/ruby191/lib" "
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: #define WIN32_LEAN_AND_MEAN
+ 4: #define WIN32
+ 5: #include <winsock2.h>
+ 6: #include <ws2tcpip.h>
+ 7: #include <windows.h>
+ 8: 
+ 9: /*top*/
+10: int main() {return 0;}
+11: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
+/* end */
+
+--------------------
+

data/src/texplay.c

@@ -68,7 +68,7 @@ Init_ctexplay() {
     rb_define_method(jm_Module, "refresh_cache", m_cache_refresh, 0);
     
     /* a constant containing the sidelength of largest allowable quad */
-    rb_define_const(jm_Module, "TP_MAX_QUAD_SIZE", INT2FIX(max_quad_size()));
+    rb_define_const(jm_Module, "TP_MAX_QUAD_SIZE", INT2FIX(max_quad_size() - 2));
 
     /* singleton method for creating & removing macros */
     rb_define_singleton_method(jm_Module, "create_macro", M_create_macro, 1);

data/src/utils.c

@@ -585,9 +585,9 @@ ComputeOutCode (int x, int y, int xmin, int ymin, int xmax, int ymax)
 	return code;
 }
  
-//Cohen-Sutherland clipping algorithm clips a line from
-//P0 = (x0, y0) to P1 = (x1, y1) against a rectangle with 
-//diagonal from (xmin, ymin) to (xmax, ymax).
+/** Cohen-Sutherland clipping algorithm clips a line from
+P0 = (x0, y0) to P1 = (x1, y1) against a rectangle with 
+diagonal from (xmin, ymin) to (xmax, ymax). **/
 void
 cohen_sutherland_clip (int * x0, int * y0,int * x1, int * y1, int xmin, int ymin,
                                 int xmax, int ymax)
@@ -762,7 +762,7 @@ check_for_texture_info(VALUE image)
         rb_raise(rb_eException, "Error: gl_tex_info returns nil for %s (%i x %i). Could be caused by "
                  "very large image or Gosu bug. Try updating Gosu or use a smaller image. Note: TexPlay should"
                  " be able to work with %i x %i images.",
-                 StringValuePtr(image_name), width, height, max_quad_size(), max_quad_size());
+                 StringValuePtr(image_name), width, height, max_quad_size() - 2, max_quad_size() - 2);
     }
 
     return info;
@@ -897,7 +897,8 @@ bool
 is_a_point(VALUE try_point)
 {
     /* if it responds to 'x' it's near enough (technically must respond to x AND y) */
-    if(rb_respond_to(try_point, rb_intern("x")))
+    /* added the is_a_num() check due to WEIRD bug where FIXNUMS were responding to the 'x' method (wtf?) but returning nil when invoked */
+    if(rb_respond_to(try_point, rb_intern("x")) && !is_a_num(try_point))
         return true;
 
     return false;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: texplay
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: x86-mswin32-60
 authors: 
 - John Mair (banisterfiend)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 +12:00
+date: 2009-09-09 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
-- README
+- README.markdown
 - CHANGELOG
 - README1st
 - lib/texplay.rb
@@ -69,9 +69,6 @@ files:
 - src/utils.h
 - src/utils.obj
 - src/vc60.pdb
-- examples/basic.rb
-- examples/basic2.rb
-- examples/benchmark.rb
 - examples/common.rb
 - examples/example_alpha_blend.rb
 - examples/example_bezier.rb
@@ -88,11 +85,9 @@ files:
 - examples/example_melt.rb
 - examples/example_polyline.rb
 - examples/example_simple.rb
+- examples/example_splice.rb
 - examples/example_sync.rb
 - examples/example_turtle.rb
-- examples/specs.rb
-- examples/test.rb
-- examples/test2.rb
 - examples/media/empty2.png
 - examples/media/gosu.png
 - examples/media/maria.png