chipmunk 5.3.4.0 → 5.3.4.2

data/README

@@ -3,7 +3,8 @@ Ruby Bindings to Chipmunk Physics Version 5.3.4
 (C) Scott Lembcke, Beoran and John Mair (banisterfiend)
 
 IMPORTANT NOTICE:
-These are bindings for MRI Ruby 1.8.x and 1.9.x to Chipmunk version 5.3.4
+These is version 5.3.4.2 of the bindings for MRI Ruby 1.8.x and 1.9.x to 
+Chipmunk version 5.3.4.
 
 (1) 1/10/09 Cross-Platform Gem built by John Mair (banisterfiend)
     * Just go: gem install chipmunk  
@@ -20,7 +21,7 @@ ABOUT CHIPMUNK:
   written in C by Slembcke. It's licensed under the unrestrictive, OSI approved 
   MIT license. 
   
-ABOUT THESE RUBY BINDINGS:  
+ABOUT THESE RUBY BINDINGS:    
   Although chipmunk comes with ruby bindings, they are not always up to date 
   with regards to the functionality of the C library, and historically, they
   have been incompatible with recent versions of Ruby. 
@@ -30,14 +31,35 @@ ABOUT THESE RUBY BINDINGS:
   intended to be an alternative to the chipmunk-ffi bindings when performance 
   is of the utmost importance, as it may be for games. 
   
-  The intent is for these bindings to be mostly source code compatible with both 
-  Slembcke's and ffi's bindings. Main exceptions are where I dislike either API. 
-  In that case, I made an API that is pleasing to myself, and similar in naming 
-  to the C API adjusted to ruby conventions. If you have any problems with these bindings, please contact the maintainer at beoran@rubyforge.org.
+  The intent is for these bindings to be mostly source code compatible with the
+  FFI bindings. Main exceptions are when it did not support the functionality I
+  added yet. All this is documented by specs and by the html documentation.
   
-INCOMPATIBILITIES:
-  There are no bindings to SpaceHash since I fail to see the use of it, but
-  if someone is using them, I'll probably implement them.
+  If you have any problems with these bindings, please contact the maintainer at
+  beoran@rubyforge.org, or report the issue on the issue tracker:  
+  https://github.com/beoran/chipmunk/issues
+  
+INSTALLATION
+  These bindings vendor Chipmunk 5.3.4 with a few extra patches, so a gem 
+  install chipmunk should do the trick. Optionally, the C chipmunk library 
+  may be installed separately. To compile without vendoring, go to the 
+  ext/chipmunk directory and compile with ruby extconf.rb --disable-vendor ; 
+  make ; make install.
+    
+DOCUMENTATION:
+  Full handcrafted documentation based on the C documentation is available at:
+  http://beoran.github.com/chipmunk/
+  
+CHANGES:
+  * Since 5.3.4.1: Vendored chipmunk again, cleanly. Several bugfixes.
+  * Since 5.1.0  : Much more of Chipmunk's functionality is wrapped. Unvendored 
+    chipmunk. More specs and documentation.
+  
+KNOWN BUGS:
+  * There are no bindings to SpaceHash since I think they are not so useful
+    anymore since Chipmunk supports BB queries.
+  * Some methods may crash with a segentation violation in case they are not
+    used correctly, according to the underlying requirements of the C library.
   
 CONTRACTING:
   Howling Moon Software (Slembke's company) is available for contracting if you 
@@ -45,10 +67,11 @@ CONTRACTING:
   them through their webpage: http://howlingmoonsoftware.com/contracting.php
 
 TODO:
-  * More functionality. 
-  * Specs for the new functionality I've wrapped and will wrap.
-  * Better documentation, perhaps based on C API documentation.
-  
+  * Allow several constructors to be more flexible and take nil as a default
+    argument.
+  * Try to prevent segfauts on incorrect use of certain methods, if possible.
+  * Get ready for chipmunk 5.3.5 and 6.x when they come out.
+  * Some more specs.
 
 INFO FOR MAINTAINERS:
 

data/Rakefile

@@ -1,7 +1,13 @@
 # Rakefile added by John Mair (banisterfiend)
  
-require 'rake/gempackagetask'
+# require 'rake/gempackagetask'
+require 'psych'
+require 'rake'
 require 'rake/clean'
+require 'rubygems'
+require 'rubygems/package_task'
+
+
  
 begin
     require 'rake/extensiontask'
@@ -12,7 +18,13 @@ rescue LoadError
 #    puts "...done!"
 end
  
-CHIPMUNK_VERSION = "5.3.4.0"
+CHIPMUNK_VERSION = "5.3.4.2"
+VENDORED_CHIPMUNK     = 'chipmunk-5.3.4'
+VENDORED_SRC_DIR      =  File.join('vendor', VENDORED_CHIPMUNK, 'src')
+VENDORED_SRC_DIR2     =  File.join('vendor', VENDORED_CHIPMUNK, 'src', 'constraints')
+VENDORED_INCLUDE_DIR  =  File.join('vendor', VENDORED_CHIPMUNK, 'include', 'chipmunk')
+
+
  
 dlext = Config::CONFIG['DLEXT']
  
@@ -26,7 +38,7 @@ def apply_spec_defaults(s)
     s.description = s.summary + " "
     s.version = CHIPMUNK_VERSION
     s.author = "Scott Lembcke, Beoran, John Mair (banisterfiend)"
-    s.email = 'beoran@rubyforge.com'
+    s.email = 'beoran@rubyforge.org'
     s.date = Time.now.strftime '%Y-%m-%d'
     s.require_path = 'lib'
     s.homepage = "https://github.com/beoran/chipmunk"
@@ -42,22 +54,23 @@ if RUBY_PLATFORM =~ /darwin/
     spec = Gem::Specification.new do |s|
         apply_spec_defaults(s)        
         s.platform = Gem::Platform::CURRENT
-        s.files = ["Rakefile", "README", "LICENSE", "lib/chipmunk.rb", "lib/1.8/chipmunk.#{dlext}", "lib/1.9/chipmunk.#{dlext}"] 
+        s.files = ["Rakefile", "README", "LICENSE", "lib/chipmunk.rb", "lib/1.8/chipmunk.#{dlext}", "lib/1.9/chipmunk.#{dlext}"] +
+            FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c"].to_a
     end
  
     Rake::ExtensionTask.new('chipmunk') do |ext|
         ext.ext_dir   = "ext"
         ext.lib_dir   = "lib/#{RUBY_VERSION[0..2]}"
         ext.config_script = 'extconf.rb'
-        ext.config_options << 'macosx'
+        ext.config_options << '--enable-macosx'
     end
  
     task :compile_multi => :clean do
-        `/bin/bash -l -c "rvm 1.8.6,1.9.1 rake compile"`
+        `/bin/bash -l -c "rvm 1.8.6,1.9.2 rake compile"`
     end
  
     task :gem => :compile_multi
-    Rake::GemPackageTask.new(spec) do |pkg|
+    Gem::PackageTask.new(spec) do |pkg|
         pkg.need_zip = false
         pkg.need_tar = false
     end
@@ -75,10 +88,11 @@ else
     Rake::ExtensionTask.new('chipmunk', spec) do |ext|
         ext.config_script = 'extconf.rb'
         ext.cross_compile = true
-        ext.cross_platform = 'i386-mswin32'
+        ext.cross_platform = 'i586-mingw32'
+        # ext.cross_platform = 'i386-mswin32'
     end
  
-    Rake::GemPackageTask.new(spec) do |pkg|
+    Gem::PackageTask.new(spec) do |pkg|
         pkg.need_zip = false
         pkg.need_tar = false
     end

data/ext/chipmunk/extconf.rb

@@ -2,41 +2,84 @@ require 'mkmf'
 
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
+if ARGV.member?('--help') || ARGV.member?('-?') 
+  puts "ruby extconf.rb:"
+  puts "Options for the Ruby bindings to Chipmunk: "
+  puts "--disable-vendor    Disables vendoring Chipmunk."
+  puts "--enable-vendor     Enables vendoring Chipmunk."
+  puts "--enable-macosx     Enables compiling for OS-X."
+  puts "--enable-64         Enables compiling to 64 bits targets."
+  puts
+  exit
+end
+
+p "pwd", Dir.pwd
+
 dir_config('chipmunk')
 
+VENDORED_CHIPMUNK     = 'chipmunk-5.3.4'
+VENDORED_SRC_DIR      =  File.join($srcdir, 'vendor', VENDORED_CHIPMUNK, 'src')
+VENDORED_SRC_DIR2     =  File.join($srcdir, 'vendor', VENDORED_CHIPMUNK, 'src',
+                                   'constraints')
+VENDORED_INCLUDE_DIR  =  File.join($srcdir, 'vendor', VENDORED_CHIPMUNK, 'include',
+                                   'chipmunk')
+
+
 MINGW = '/usr/i586-mingw32msvc'
 CHIPMUNK_HEADER   = 'chipmunk.h'
 CHIPMUNK_NAME     = 'chipmunk'
 CHIPMUNK_FUNCTION = 'cpMomentForPoly'
-CHIPMUNK_INCLUDE  = ['/usr/include', 
+CHIPMUNK_INCLUDE  = [ '/usr/include', 
                       File.join(MINGW, 'include'),
                       File.join(MINGW, 'include', 'chipmunk'),
                      '/usr/local/include', 
                      '/usr/include/chipmunk',
                      '/usr/local/include/chipmunk'
                     ]
-CHIPMUNK_LIBDIR   = ['/usr/lib', 
-File.join(MINGW, 'lib'),
-'/usr/local/lib']
+CHIPMUNK_LIBDIR   = ['/usr/lib', File.join(MINGW, 'lib'), '/usr/local/lib']
 
-unless find_header(CHIPMUNK_HEADER, *CHIPMUNK_INCLUDE)
-  raise "Could not find Chipmunk headers!" 
-end
+# This is a bit of a trick to cleanly vendor the chipmunk C library.
+sources           = Dir.glob(File.join($srcdir, 'rb_*.c')).to_a
+# normally, we need the rb_xxx files...
 
 
-unless find_library(CHIPMUNK_NAME, CHIPMUNK_FUNCTION, *CHIPMUNK_LIBDIR)
-  raise "Could not link to Chipmunk library!" 
+if enable_config("vendor", true)
+  unless find_header(CHIPMUNK_HEADER, VENDORED_INCLUDE_DIR)
+    raise "Vendored chipmunk #{VENDORED_INCLUDE_DIR} not found!"
+  end
+  CHIPMUNK_INCLUDE .unshift(VENDORED_INCLUDE_DIR)
+  sources        += Dir.glob(File.join(VENDORED_SRC_DIR, '*.c'))
+  sources        += Dir.glob(File.join(VENDORED_SRC_DIR2, '*.c'))
+  # when vendoring, also include the needed c files files...
+  
+  
+else
+  unless find_header(CHIPMUNK_HEADER, *CHIPMUNK_INCLUDE)
+    raise "Could not find Chipmunk headers!" 
+  end
+
+  unless find_library(CHIPMUNK_NAME, CHIPMUNK_FUNCTION, *CHIPMUNK_LIBDIR)
+    raise "Could not link to Chipmunk library!" 
+  end
 end
 
+# this is the core of the trick, it overrides create_makefile's looking for 
+# based on the c files
+$objs = sources.map { |s| s.gsub(/.c\Z/,'.o') }
+
+
 =begin
 have_header('chipmunk.h', include_dirs)
 =end
- 
-if ARGV[0] == "macosx"
+if enable_config("macosx", false) 
     $CFLAGS += ' -arch ppc -arch i386 -arch x86_64'
     $LDFLAGS += ' -arch x86_64 -arch i386 -arch ppc'
 end
+
+if enable_config("64", false)
+  $CFLAGS += ' -m64'
+end
  
-$CFLAGS += ' -std=gnu99 -ffast-math'
+$CFLAGS += ' -std=gnu99 -ffast-math -DNDEBUG '
 create_makefile('chipmunk')
 

data/ext/chipmunk/rb_chipmunk.c

@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,65 +32,62 @@ ID id_parent;
 
 static VALUE
 rb_get_cp_bias_coef(VALUE self) {
-	return rb_float_new(cp_bias_coef);
+  return rb_float_new(cp_bias_coef);
 }
 
 static VALUE
 rb_set_cp_bias_coef(VALUE self, VALUE num) {
-	cp_bias_coef = NUM2DBL(num);
-	return num;
+  cp_bias_coef = NUM2DBL(num);
+  return num;
 }
 
 static VALUE
 rb_get_cp_collision_slop(VALUE self) {
-	return rb_float_new(cp_collision_slop);
+  return rb_float_new(cp_collision_slop);
 }
 
 static VALUE
 rb_set_cp_collision_slop(VALUE self, VALUE num) {
-	cp_collision_slop = NUM2DBL(num);
-	return num;
+  cp_collision_slop = NUM2DBL(num);
+  return num;
 }
 
 static VALUE
 rb_set_cp_contact_persistence(VALUE self, VALUE num) {
-  cp_contact_persistence = NUM2DBL(num);
+  cp_contact_persistence = NUM2UINT(num);
   return num;
 }
 
 static VALUE
-rb_get_cp_contact_persistence(VALUE self) {   
-  return rb_float_new(cp_contact_persistence);
+rb_get_cp_contact_persistence(VALUE self) {
+  return UINT2NUM(cp_contact_persistence);
 }
 
 
 static VALUE
-rb_cpMomentForCircle(VALUE self, VALUE m, VALUE r1, VALUE r2, VALUE offset)
-{
-	cpFloat i = cpMomentForCircle(NUM2DBL(m), NUM2DBL(r1), NUM2DBL(r2), *VGET(offset));
-	return rb_float_new(i);
+rb_cpMomentForCircle(VALUE self, VALUE m, VALUE r1, VALUE r2, VALUE offset) {
+  cpFloat i = cpMomentForCircle(NUM2DBL(m), NUM2DBL(r1), NUM2DBL(r2), *VGET(offset));
+  return rb_float_new(i);
 }
 
 static VALUE
-rb_cpMomentForSegment(VALUE self, VALUE m, VALUE v1, VALUE v2)
-{
+rb_cpMomentForSegment(VALUE self, VALUE m, VALUE v1, VALUE v2) {
   cpFloat i = cpMomentForSegment(NUM2DBL(m), *VGET(v1), *VGET(v2));
   return rb_float_new(i);
 }
 
 static VALUE
-rb_cpMomentForPoly(VALUE self, VALUE m, VALUE arr, VALUE offset)
-{
-	Check_Type(arr, T_ARRAY);
-	int numVerts = RARRAY_LEN(arr);
-	VALUE *ary_ptr = RARRAY_PTR(arr);
-	cpVect verts[numVerts];
-	
-	for(int i=0; i<numVerts; i++)
-		verts[i] = *VGET(ary_ptr[i]);
-	
-	cpFloat inertia = cpMomentForPoly(NUM2DBL(m), numVerts, verts, *VGET(offset));
-	return rb_float_new(inertia);
+rb_cpMomentForPoly(VALUE self, VALUE m, VALUE arr, VALUE offset) {
+  Check_Type(arr, T_ARRAY);
+  long numVerts    = RARRAY_LEN(arr);
+  VALUE *ary_ptr  = RARRAY_PTR(arr);
+  cpVect verts[numVerts];
+
+  for(long i = 0; i < numVerts; i++)
+    verts[i] = *VGET(ary_ptr[i]);
+
+  cpFloat inertia = cpMomentForPoly(NUM2DBL(m), numVerts, verts, *VGET(offset));
+  return rb_float_new(inertia);
 }
 
 static VALUE
@@ -100,31 +97,28 @@ rb_cpMomentForBox(VALUE self, VALUE m, VALUE w, VALUE h) {
 }
 
 static VALUE
-rb_cpAreaForCircle(VALUE self, VALUE r1, VALUE r2)
-{
+rb_cpAreaForCircle(VALUE self, VALUE r1, VALUE r2) {
   cpFloat i = cpAreaForCircle(NUM2DBL(r1), NUM2DBL(r2));
   return rb_float_new(i);
 }
 
 static VALUE
-rb_cpAreaForSegment(VALUE self, VALUE v1, VALUE v2, VALUE r)
-{
+rb_cpAreaForSegment(VALUE self, VALUE v1, VALUE v2, VALUE r) {
   cpFloat i = cpAreaForSegment(*VGET(v1), *VGET(v2), NUM2DBL(r));
   return rb_float_new(i);
 }
 
 static VALUE
-rb_cpAreaForPoly(VALUE self, VALUE arr)
-{
+rb_cpAreaForPoly(VALUE self, VALUE arr) {
   Check_Type(arr, T_ARRAY);
-  int numVerts = RARRAY_LEN(arr);
+  long numVerts   = RARRAY_LEN(arr);
   VALUE *ary_ptr = RARRAY_PTR(arr);
   cpVect verts[numVerts];
-  
-  for(int i=0; i<numVerts; i++)
+
+  for(long i = 0; i < numVerts; i++)
     verts[i] = *VGET(ary_ptr[i]);
-  
-  cpFloat area = cpAreaForPoly(numVerts, verts);
+
+  cpFloat area   = cpAreaForPoly(numVerts, verts);
   return rb_float_new(area);
 }
 
@@ -135,49 +129,50 @@ rb_cpAreaForBox(VALUE self, VALUE w, VALUE h) {
 }
 
 
-static VALUE rb_cpfclamp(VALUE self, VALUE f, VALUE min, VALUE max) {
+static VALUE
+rb_cpfclamp(VALUE self, VALUE f, VALUE min, VALUE max) {
   cpFloat result = cpfclamp(NUM2DBL(f), NUM2DBL(min), NUM2DBL(max));
   return rb_float_new(result);
-} 
+}
 
-static VALUE rb_cpflerp(VALUE self, VALUE f1, VALUE f2, VALUE t) {
+static VALUE
+rb_cpflerp(VALUE self, VALUE f1, VALUE f2, VALUE t) {
   cpFloat result = cpflerp(NUM2DBL(f1), NUM2DBL(f2), NUM2DBL(t));
   return rb_float_new(result);
-} 
+}
 
-static VALUE rb_cpflerpconst(VALUE self, VALUE f1, VALUE f2, VALUE d) {
+static VALUE
+rb_cpflerpconst(VALUE self, VALUE f1, VALUE f2, VALUE d) {
   cpFloat result = cpflerpconst(NUM2DBL(f1), NUM2DBL(f2), NUM2DBL(d));
   return rb_float_new(result);
-} 
+}
 
 static VALUE
-rb_cpCentroidForPoly(VALUE self,  VALUE arr)
-{
+rb_cpCentroidForPoly(VALUE self,  VALUE arr) {
   Check_Type(arr, T_ARRAY);
-  int numVerts = RARRAY_LEN(arr);
+  long numVerts   = RARRAY_LEN(arr);
   VALUE *ary_ptr = RARRAY_PTR(arr);
   cpVect verts[numVerts];
-  
-  for(int i=0; i<numVerts; i++)
+
+  for(long i = 0; i < numVerts; i++)
     verts[i] = *VGET(ary_ptr[i]);
-  
+
   return VNEW(cpCentroidForPoly(numVerts, verts));
 }
 
 static VALUE
-rb_cpRecenterPoly(VALUE self,  VALUE arr)
-{
+rb_cpRecenterPoly(VALUE self,  VALUE arr) {
   Check_Type(arr, T_ARRAY);
-  int numVerts = RARRAY_LEN(arr);
+  long numVerts   = RARRAY_LEN(arr);
   VALUE *ary_ptr = RARRAY_PTR(arr);
   cpVect verts[numVerts];
-  
-  for(int i=0; i<numVerts; i++)
+
+  for(long i = 0; i < numVerts; i++)
     verts[i] = *VGET(ary_ptr[i]);
-    
+
   cpRecenterPoly(numVerts, verts);
-  
-  for(int i=0; i<numVerts; i++)
+
+  for(long i = 0; i < numVerts; i++)
     ary_ptr[i] = VNEW(verts[i]);
   return arr;
 }
@@ -186,65 +181,64 @@ rb_cpRecenterPoly(VALUE self,  VALUE arr)
 
 
 void
-Init_chipmunk(void)
-{
-	id_parent = rb_intern("parent");
-	
-	cpInitChipmunk();
-	
-
-	
-	m_Chipmunk = rb_define_module("CP");
-	rb_define_module_function(m_Chipmunk, "bias_coef", rb_get_cp_bias_coef, 0);
-	rb_define_module_function(m_Chipmunk, "bias_coef=", rb_set_cp_bias_coef, 1);
-	rb_define_module_function(m_Chipmunk, "collision_slop", rb_get_cp_collision_slop, 0);
-	rb_define_module_function(m_Chipmunk, "collision_slop=", rb_set_cp_collision_slop, 1);
+Init_chipmunk(void) {
+  id_parent  = rb_intern("parent");
+
+  cpInitChipmunk();
+
+
+
+  m_Chipmunk = rb_define_module("CP");
+  rb_define_module_function(m_Chipmunk, "bias_coef", rb_get_cp_bias_coef, 0);
+  rb_define_module_function(m_Chipmunk, "bias_coef=", rb_set_cp_bias_coef, 1);
+  rb_define_module_function(m_Chipmunk, "collision_slop", rb_get_cp_collision_slop, 0);
+  rb_define_module_function(m_Chipmunk, "collision_slop=", rb_set_cp_collision_slop, 1);
   rb_define_module_function(m_Chipmunk, "contact_persistence", rb_get_cp_contact_persistence, 0);
   rb_define_module_function(m_Chipmunk, "contact_persistence=", rb_set_cp_contact_persistence, 1);
-  
-  
-  
+
+
+
   rb_define_module_function(m_Chipmunk, "clamp", rb_cpfclamp, 3);
   rb_define_module_function(m_Chipmunk, "flerp", rb_cpflerp, 3);
   rb_define_module_function(m_Chipmunk, "flerpconst", rb_cpflerpconst, 3);
-	
-	rb_define_module_function(m_Chipmunk, "moment_for_circle", rb_cpMomentForCircle, 4);
-	rb_define_module_function(m_Chipmunk, "moment_for_poly", rb_cpMomentForPoly, 3);
+
+  rb_define_module_function(m_Chipmunk, "moment_for_circle", rb_cpMomentForCircle, 4);
+  rb_define_module_function(m_Chipmunk, "moment_for_poly", rb_cpMomentForPoly, 3);
   rb_define_module_function(m_Chipmunk, "moment_for_segment", rb_cpMomentForSegment, 3);
   rb_define_module_function(m_Chipmunk, "moment_for_box", rb_cpMomentForBox, 3);
-  
+
   rb_define_module_function(m_Chipmunk, "circle_moment", rb_cpMomentForCircle, 4);
   rb_define_module_function(m_Chipmunk, "poly_moment", rb_cpMomentForPoly, 3);
   rb_define_module_function(m_Chipmunk, "segment_moment", rb_cpMomentForSegment, 3);
   rb_define_module_function(m_Chipmunk, "box_moment", rb_cpMomentForBox, 3);
- 
- 
+
+
   rb_define_module_function(m_Chipmunk, "area_for_circle", rb_cpAreaForCircle, 2);
   rb_define_module_function(m_Chipmunk, "area_for_poly", rb_cpAreaForPoly, 1);
   rb_define_module_function(m_Chipmunk, "centroid_for_poly",
-    rb_cpCentroidForPoly, 1);
+                            rb_cpCentroidForPoly, 1);
   rb_define_module_function(m_Chipmunk, "recenter_poly",
-    rb_cpRecenterPoly, 1);
-    
+                            rb_cpRecenterPoly, 1);
+
   rb_define_module_function(m_Chipmunk, "area_for_segment", rb_cpAreaForSegment, 3);
   rb_define_module_function(m_Chipmunk, "area_for_box", rb_cpAreaForBox, 2);
-  
+
   rb_define_module_function(m_Chipmunk, "circle_area", rb_cpAreaForCircle, 2);
   rb_define_module_function(m_Chipmunk, "poly_area", rb_cpAreaForPoly, 1);
   rb_define_module_function(m_Chipmunk, "segment_area", rb_cpAreaForSegment, 3);
   rb_define_module_function(m_Chipmunk, "box_area", rb_cpAreaForBox, 2);
-  
+
   rb_define_const(m_Chipmunk, "ALL_LAYERS", UINT2NUM((unsigned int)CP_ALL_LAYERS));
-  rb_define_const(m_Chipmunk, "NO_GROUP"  , UINT2NUM(CP_NO_GROUP));
+  rb_define_const(m_Chipmunk, "NO_GROUP", UINT2NUM(CP_NO_GROUP));
 
   rb_eval_string("Float::INFINITY = 1.0/0.0 unless Float.const_defined? :INFINITY");
-  rb_eval_string("CP::INFINITY = 1.0/0.0 unless CP.const_defined? :INFINITY"); 
-  
-	Init_cpVect();
-	Init_cpBB();
-	Init_cpBody();
-	Init_cpShape();
-	Init_cpConstraint();
-	Init_cpSpace();
-  Init_cpArbiter();  
+  rb_eval_string("CP::INFINITY = 1.0/0.0 unless CP.const_defined? :INFINITY");
+
+  Init_cpVect();
+  Init_cpBB();
+  Init_cpBody();
+  Init_cpShape();
+  Init_cpConstraint();
+  Init_cpSpace();
+  Init_cpArbiter();
 }