devil 0.1.2 → 0.1.6

data/README

@@ -1,4 +1,5 @@
-Devil version 0.1.2
+Devil version 0.1.6
+===================
 
 * Original author: Jaroslaw Tworek <dev.jrx@gmail.com>
 * Current maintainer: John Mair (banisterfiend) http://banisterfiend.wordpress.com
@@ -6,20 +7,27 @@ Devil version 0.1.2
 Ruby bindings for the Developer's Image Library
 You need DevIL installed to build this extension
 
+Installation Instructions:
+==========================
+
 For debian:
 * install the libdevil and libdevil-dev packages
 
-Or go here to download the libraries:
-http://openil.sourceforge.net
-
-It's also worth having Ruby OpenGL bindings to use the extensions.
+For windows:
+* download devil.dll and ilu.dll from here http://openil.sourceforge.net
+* and copy devil.dll and ilu.dll to c:\windows\system\
 
-http://www2.geganet.net/~yoshi/
+For other systems:
+* install libdevil and lib-devil-dev using your package manager
+* OR download and install the libraries from http://openil.sourceforge.net
 
-See INSTALL for installation instructions.
+If you wish to use the Gosu and TexPlay extensions, it is necessary to also have:
+* the Gosu gem (gem install gosu)
+* the TexPlay gem (gem install texplay)
+* ruby-opengl (gem install ruby-opengl)
 
 For now, there is support for just a subset of DevIL functions, but it is enough
 for 95% things you may want to do.
 
 For example uses, see test/ directory
-
+(note: that many of the examples use the Gosu library...this is often just for visualization purposes. Alot of the functionality does not depend on Gosu being present)

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-DEVIL_VERSION = "0.1.2"
+DEVIL_VERSION = "0.1.6"
 
 dlext = Config::CONFIG['DLEXT']
 
@@ -21,13 +21,27 @@ spec = Gem::Specification.new do |s|
     s.date = Time.now.strftime '%Y-%m-%d'
     s.require_path = 'lib'
     s.homepage = "http://banisterfiend.wordpress.com"
-    s.platform = Gem::Platform::RUBY
-    s.extensions = FileList["ext/**/extconf.rb"]
+
+    if RUBY_PLATFORM =~ /win/
+        s.platform = Gem::Platform::CURRENT
+    else
+        s.platform = Gem::Platform::RUBY
+    end
+
+    if RUBY_PLATFORM !~ /win/
+        s.extensions = FileList["ext/**/extconf.rb"]
+    end
+    
     s.has_rdoc = true
     s.extra_rdoc_files = ["README"]
     s.rdoc_options << '--main' << 'README'
-    s.files = ["Rakefile", "README", "LICENSE", "lib/devil.rb"] +
-        FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "test/test*.rb"].to_a
+    s.files = ["Rakefile", "README", "LICENSE", "lib/devil.rb", "lib/devil/gosu.rb"] +
+        FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "test/test*.rb", "test/*.png", "test/*.jpg"].to_a
+
+    if RUBY_PLATFORM =~ /win/
+        s.files += ["lib/1.8/devil.so", "lib/1.9/devil.so"]
+    end
+
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -35,6 +49,8 @@ Rake::GemPackageTask.new(spec) do |pkg|
     pkg.need_tar = false
 end
 
+task :compile => :clean
+
 Rake::ExtensionTask.new('devil', spec)  do |ext|
     ext.config_script = 'extconf.rb' 
     ext.cross_compile = true                
@@ -49,6 +65,6 @@ end
 
 Rake::RDocTask.new do |rd|
   rd.main = "README"
-  rd.rdoc_files.include("README", "lib/devil.rb")
+  rd.rdoc_files.include("README", "lib/devil.rb", "lib/devil/gosu.rb")
 end
 

data/ext/devil/extconf.rb

@@ -1,9 +1,19 @@
 require 'mkmf'
 
-#$CFLAGS += ' -I/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/include/'
-#$LDFLAGS += ' -L/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/lib/'
-exit unless have_library("IL", "ilInit");
-exit unless have_library("ILU", "iluInit");
+if RUBY_PLATFORM =~ /mingw/
+    $CFLAGS += ' -I/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/include/'
+    $LDFLAGS += ' -L/home/john/.rake-compiler/ruby/ruby-1.8.6-p287/lib/'
+end
+
+puts "platform is #{RUBY_PLATFORM}"
+if RUBY_PLATFORM =~ /win/ || RUBY_PLATFORM =~ /mingw/
+    exit unless have_library("DevIL");
+else
+    exit unless have_library("IL");
+end
+
+exit unless have_library("ILU");
+
 #have_library("ILUT", "ilutInit");
 
 create_makefile('devil')

data/ext/devil/ruby_il.c

@@ -131,28 +131,28 @@ static VALUE il_GetData(VALUE obj) {
     return MakeImageData(data);
 }
 
-ILuint ilCopyPixels(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width,
-                    /* changed from ILvoid */
-                    ILuint Height, ILuint Depth, ILenum Format, ILenum Type, void
-                    *Data);
-
-static VALUE il_CopyPixels(VALUE obj, VALUE rb_XOff, VALUE rb_YOff, VALUE rb_ZOff,
-                           VALUE rb_Width, VALUE rb_Height, VALUE rb_Depth, VALUE rb_Format,
-                           VALUE rb_Type, VALUE rb_data) {
-    ILuint XOff = NUM2INT(rb_XOff);
-    ILuint YOff = NUM2INT(rb_YOff);
-    ILuint ZOff = NUM2INT(rb_ZOff);
-    ILuint Width = NUM2INT(rb_Width);
-    ILuint Height = NUM2INT(rb_Height);
-    ILuint Depth = NUM2INT(rb_Depth);
-    ILenum Format = NUM2INT(rb_Format);
-    ILenum Type = NUM2INT(rb_Type);
-    /* ILvoid */
-    void* data = ImageData2Arr(rb_data);
-
-    ILuint uint = ilCopyPixels(XOff, YOff, ZOff, Width, Height, Depth, Format, Type, data);
-    return INT2FIX(uint);    
-}
+/* ILuint ilCopyPixels(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, */
+/*                     /\* changed from ILvoid *\/ */
+/*                     ILuint Height, ILuint Depth, ILenum Format, ILenum Type, void */
+/*                     *Data); */
+
+/* static VALUE il_CopyPixels(VALUE obj, VALUE rb_XOff, VALUE rb_YOff, VALUE rb_ZOff, */
+/*                            VALUE rb_Width, VALUE rb_Height, VALUE rb_Depth, VALUE rb_Format, */
+/*                            VALUE rb_Type, VALUE rb_data) { */
+/*     ILuint XOff = NUM2INT(rb_XOff); */
+/*     ILuint YOff = NUM2INT(rb_YOff); */
+/*     ILuint ZOff = NUM2INT(rb_ZOff); */
+/*     ILuint Width = NUM2INT(rb_Width); */
+/*     ILuint Height = NUM2INT(rb_Height); */
+/*     ILuint Depth = NUM2INT(rb_Depth); */
+/*     ILenum Format = NUM2INT(rb_Format); */
+/*     ILenum Type = NUM2INT(rb_Type); */
+/*     /\* ILvoid *\/ */
+/*     void* data = ImageData2Arr(rb_data); */
+
+/*     ILuint uint = ilCopyPixels(XOff, YOff, ZOff, Width, Height, Depth, Format, Type, data); */
+/*     return INT2FIX(uint);     */
+/* } */
 
 static VALUE il_SetData(VALUE obj, VALUE rb_Data) {
     /* ILvoid */
@@ -234,7 +234,7 @@ static VALUE il_ActiveImage(VALUE obj, VALUE rb_Number){
     return flag ? Qtrue : Qfalse;
 }
 
-/* added by banisterfiend */
+/* methods below added by banisterfiend */
 static VALUE il_Enable(VALUE obj, VALUE rb_mode) {
     ILenum mode = NUM2INT(rb_mode);
 
@@ -248,6 +248,60 @@ static VALUE il_GetInteger(VALUE obj, VALUE rb_mode) {
     ILint result = ilGetInteger(mode);
     return INT2NUM(result);
 }
+
+static VALUE il_ConvertImage(VALUE obj, VALUE rb_destformat, VALUE rb_desttype)
+{
+    ILenum destformat = NUM2INT(rb_destformat);
+    ILenum desttype = NUM2INT(rb_desttype);
+
+    ILboolean flag = ilConvertImage(destformat, desttype);
+    return flag ? Qtrue : Qfalse;
+}
+
+/* this function is not actualy in the DevIL API, but im adding it here for convenience */
+static VALUE bf_ToBlob(VALUE obj)
+{
+    ILuint width, height;
+    char * img_ptr;
+    VALUE blob;
+    
+    ilConvertImage(IL_RGBA, IL_UNSIGNED_BYTE);
+
+    width = ilGetInteger(IL_IMAGE_WIDTH);
+    height = ilGetInteger(IL_IMAGE_HEIGHT);
+
+    img_ptr = (char *)ilGetData();
+
+    blob = rb_str_new(img_ptr, 4 * width * height);
+
+    return blob;
+}
+
+static VALUE bf_FromBlob(VALUE obj, VALUE blob, VALUE rb_width, VALUE rb_height)
+{
+    ILubyte * data;
+    ILuint width, height;
+    ILuint image;
+
+    width = NUM2INT(rb_width);
+    height = NUM2INT(rb_height);
+
+    data = (ILubyte *) RSTRING_PTR(blob);
+
+    ilGenImages(1, &image);
+    ilBindImage(image);
+
+    ilTexImage(width, height, 1, 4, IL_RGBA, IL_UNSIGNED_BYTE, data);
+
+    return INT2NUM(image);
+}
+
+static VALUE il_CloneCurImage(VALUE obj)
+{
+    ILuint clone = ilCloneCurImage();
+
+    return INT2NUM(clone);
+}
 /* end of banisterfiend additions */
 
 void
@@ -272,7 +326,7 @@ InitializeIL() {
     rb_define_module_function(mIL, "Save", il_Save, 2);
     rb_define_module_function(mIL, "TexImage", il_TexImage, 7);
     rb_define_module_function(mIL, "GetData", il_GetData, 0);
-    rb_define_module_function(mIL, "CopyPixels", il_CopyPixels, 9);
+    /* rb_define_module_function(mIL, "CopyPixels", il_CopyPixels, 9); */
     rb_define_module_function(mIL, "SetData", il_SetData, 1);
     rb_define_module_function(mIL, "SetPixels", il_SetPixels, 9);
     rb_define_module_function(mIL, "CopyImage", il_CopyImage, 1);
@@ -282,10 +336,14 @@ InitializeIL() {
     rb_define_module_function(mIL, "ActiveMipmap", il_ActiveMipmap, 1);
     rb_define_module_function(mIL, "ActiveImage", il_ActiveImage, 1);
 
-    // METHODS ADDED BY BANISTERFIEND
+    /* methods added by baniterfiend */
     rb_define_module_function(mIL, "Enable", il_Enable, 1);
     rb_define_module_function(mIL, "GetInteger", il_GetInteger, 1);
-
+    rb_define_module_function(mIL, "ConvertImage", il_ConvertImage, 2);
+    rb_define_module_function(mIL, "ToBlob", bf_ToBlob, 0);
+    rb_define_module_function(mIL, "FromBlob", bf_FromBlob, 3);
+    rb_define_module_function(mIL, "CloneCurImage", il_CloneCurImage, 0);
+    /* end of methods added by banisterfiend */
     
     //////////////////////////////////
     //CONSTANTS
@@ -298,7 +356,13 @@ InitializeIL() {
     rb_define_const(mIL, "ICO", INT2NUM(IL_ICO));
     rb_define_const(mIL, "JPG", INT2NUM(IL_JPG));
     rb_define_const(mIL, "JFIF", INT2NUM(IL_JFIF));
+    
+#ifdef _WIN32    
+    rb_define_const(mIL, "LBM", INT2NUM(IL_ILBM));
+#else
     rb_define_const(mIL, "LBM", INT2NUM(IL_LBM));
+#endif    
+
     rb_define_const(mIL, "PCD", INT2NUM(IL_PCD));
     rb_define_const(mIL, "PCX", INT2NUM(IL_PCX));
     rb_define_const(mIL, "PIC", INT2NUM(IL_PIC));
@@ -373,6 +437,7 @@ InitializeIL() {
     // CONSTANTS BELOW ADDED BY BANISTERFIEND
     rb_define_const(mIL, "IMAGE_WIDTH", INT2NUM(IL_IMAGE_WIDTH));
     rb_define_const(mIL, "IMAGE_HEIGHT", INT2NUM(IL_IMAGE_HEIGHT));
+    rb_define_const(mIL, "IMAGE_FORMAT", INT2NUM(IL_IMAGE_FORMAT));
     rb_define_const(mIL, "FILE_OVERWRITE", INT2NUM(IL_FILE_OVERWRITE));
 }
 //////////////////////////////////////////

data/ext/devil/ruby_ilu.c

@@ -89,6 +89,33 @@ static VALUE ilu_BuildMipmaps(VALUE obj) {
     return flag ? Qtrue : Qfalse;
 }
 
+/* functions added by banisterfiend */
+static VALUE ilu_FlipImage(VALUE obj) {
+    ILboolean flag = iluFlipImage();
+    return flag ? Qtrue : Qfalse;
+}
+
+static VALUE ilu_Rotate(VALUE obj, VALUE rb_angle) {
+    ILfloat angle = NUM2DBL(rb_angle);
+
+    ILboolean flag = iluRotate(angle);
+
+    return flag ? Qtrue : Qfalse;
+}
+
+static VALUE ilu_Crop(VALUE obj, VALUE rb_XOff, VALUE rb_YOff, VALUE rb_width, VALUE rb_height)
+{
+    ILuint XOff = NUM2INT(rb_XOff);
+    ILuint YOff = NUM2INT(rb_YOff);
+    ILuint width = NUM2INT(rb_width);
+    ILuint height = NUM2INT(rb_height);
+                       	
+    ILboolean flag = iluCrop(XOff, YOff, 1, width, height, 1);
+
+    return flag ? Qtrue : Qfalse;
+}
+/* end of functions added by banisterfiend */
+
 void
 InitializeILU() {
     mILU = rb_define_module("ILU");
@@ -108,6 +135,12 @@ InitializeILU() {
     rb_define_module_function(mILU, "ImageParameter", ilu_ImageParameter , 2);
     rb_define_module_function(mILU, "BuildMipmaps",  ilu_BuildMipmaps, 0);
 
+    /* methods added by banisterfiend */
+    rb_define_module_function(mILU, "FlipImage",  ilu_FlipImage, 0);
+    rb_define_module_function(mILU, "Rotate",  ilu_Rotate, 1);
+    rb_define_module_function(mILU, "Crop",  ilu_Crop, 4);
+    /* end of functions added by banisterfiend */
+
     rb_define_const(mILU, "FILTER", INT2NUM(ILU_FILTER));
     rb_define_const(mILU, "NEAREST", INT2NUM(ILU_NEAREST));
     rb_define_const(mILU, "LINEAR", INT2NUM(ILU_LINEAR));

data/lib/devil.rb

@@ -14,39 +14,49 @@ end
 
 # Provides a high level wrapper for the low-level DevIL Ruby bindings
 module Devil
-    VERSION = '0.1.2'
+    VERSION = '0.1.6'
     
-    # loads +file+ and returns a new image
-    # Optionally accepts a block and yields the newly created image to the block.
-    def self.load_image(file, &block)
-        name = IL.GenImages(1).first
-        IL.BindImage(name)
-        IL.LoadImage(file)
+    class << self
 
-        img = Image.new(name, file)
-        if block
-            block.call(img)
+        # loads +file+ and returns a new image
+        # Optionally accepts a block and yields the newly created image to the block.
+        def load_image(file, &block)
+            name = IL.GenImages(1).first
+            IL.BindImage(name)
+            IL.LoadImage(file)
+
+            img = Image.new(name, file)
+            if block
+                block.call(img)
+            end
+            
+            img
+        end
+
+        # convert an image +blob+ with +width+ and +height+
+        # to a bona fide image
+        def from_blob(blob, width, height)
+            Image.new(IL.FromBlob(blob, width, height), nil)
         end
-        
-        img
-    end
 
-    # initializes Devil and sets defaults
-    # This method should never need to be called directly.
-    def self.init
-        # initialize DevIL
-        IL.Init
+        # initializes Devil and sets defaults
+        # This method should never need to be called directly.
+        def init
+            # initialize DevIL
+            IL.Init
 
-        # default options
-        IL.Enable(IL::FILE_OVERWRITE)
-        ILU.ImageParameter(ILU::FILTER, ILU::BILINEAR) 
-    end
+            # default options
+            IL.Enable(IL::FILE_OVERWRITE)
+            ILU.ImageParameter(ILU::FILTER, ILU::BILINEAR) 
+        end
 
-    class << self
         alias_method :with_image, :load_image
+        alias_method :load, :load_image
     end
 
     class Image
+        attr_reader :name, :file
+
         def initialize(name, file)
             @name = name
             @file = file
@@ -70,25 +80,56 @@ module Devil
         def save(file = @file)
             set_binding
             IL.SaveImage(file)
+            self
         end
-
         
         # resize the image to +width+ and +height+. Aspect ratios of the image do not have to be the same.
         def resize(width, height)
             set_binding
             ILU.Scale(width, height, 1)
+            self
+        end
+
+        # Creates a proportional thumbnail of the image scaled so its longest
+        # edge is resized to +size+ 
+        def thumbnail(size)
+            # this thumbnail code from image_science.rb
+            
+            w, h = width, height
+            scale = size.to_f / (w > h ? w : h)
+            resize((w * scale).to_i, (h * scale).to_i)
+            self
+        end
+
+        # return a deep copy of the current image
+        def dup
+            set_binding
+            Image.new(IL.CloneCurImage, nil)
+        end
+
+        # crop the current image
+        # +xoff+ number of pixels to skip in x direction
+        # +yoff+ number of pixels to skip in y direction
+        # +width+ number of pixels to preserve in x direction
+        # +height+ number of pixels to preserve in y direction
+        def crop(xoff, yoff, width, height)
+            set_binding
+            ILU.Crop(xoff, yoff, width, height)
+            self
         end
 
         # performs a gaussian blur on the image. The blur is performed +iter+ times.
         def blur(iter)
             set_binding
             ILU.BlurGaussian(iter)
+            self
         end
 
         # 'pixelize' the image using a pixel size of +pixel_size+
         def pixelize(pixel_size)
             set_binding
             ILU.Pixelize(pixel_size)
+            self
         end
 
         # add random noise to the image. +factor+ is the tolerance to use.
@@ -96,6 +137,7 @@ module Devil
         def noisify(factor)
             set_binding
             ILU.Noisify(factor)
+            self
         end
 
         # The sharpening +factor+ must be in the range of 0.0 - 2.5. A value of 1.0 for the sharpening
@@ -109,6 +151,7 @@ module Devil
         def sharpen(factor, iter)
             set_binding
             ILU.Sharpen(factor, iter)
+            self
         end
 
         # applies gamma correction to an image using an exponential curve.
@@ -119,12 +162,14 @@ module Devil
         def gamma_correct(factor)
             set_binding
             ILU.GammaCorrect(factor)
+            self
         end
 
         # invert the color of every pixel in the image.
         def negative
             set_binding
             ILU.Negative
+            self
         end
 
         # +factor+ describes desired contrast to use
@@ -134,6 +179,7 @@ module Devil
         def contrast(factor)
             set_binding
             ILU.Contrast(factor)
+            self
         end
 
         # darkens the bright colours and lightens the dark
@@ -141,13 +187,39 @@ module Devil
         def equalize
             set_binding
             ILU.Equalize
+            self
         end
-        
+
+        # returns the image data in the form of a ruby string
+        # The image data is formatted to RGBA / UNSIGNED BYTE
+        def to_blob
+            set_binding
+            IL.ToBlob
+        end
+
+        # flip the image about its x axis
+        def flip
+            set_binding
+            ILU.FlipImage
+            self
+        end
+
+        # rotate an image about its central point by +angle+ degrees
+        def rotate(angle)
+            set_binding
+            ILU.Rotate(angle)
+            self
+        end
+
+        alias_method :columns, :width
+        alias_method :rows, :height
+
         private
         
         def set_binding
             IL.BindImage(@name)
         end
+
     end
 end
 

data/lib/devil/gosu.rb

@@ -0,0 +1,96 @@
+require 'texplay'
+require 'devil'
+
+module TexPlay
+
+    # save a Gosu::Image to +file+
+    # This method is only available if require 'devil/gosu' is used
+    def save(file)
+        capture { 
+            save_image = Devil.from_blob(self.to_blob, self.width, self.height)
+            save_image.flip
+            save_image.save(file)
+        }
+    end
+
+    # convert a Gosu::Image to a Devil::Image
+    # This method is only available if require 'devil/gosu' is used
+    def to_devil
+        devil_img = nil
+        capture {
+            devil_img = Devil.from_blob(self.to_blob, self.width, self.height)
+            devil_img.flip
+        }
+        devil_img
+    end
+end
+
+class Gosu::Window
+
+    # return a screenshot of the framebuffer as a Devil::Image
+    # This method is only available if require 'devil/gosu' is used
+    def screenshot
+        require 'opengl'
+
+        canvas_texture_id = glGenTextures(1).first
+        
+        img = nil
+        self.gl do
+            glEnable(GL_TEXTURE_2D)
+            glBindTexture(GL_TEXTURE_2D, canvas_texture_id)
+            
+            glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1)
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)
+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, self.width, self.height, 0, GL_RGB, GL_UNSIGNED_BYTE, "\0" * self.width * self.height * 3)
+            
+            glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, self.width, self.height, 0)
+
+            data = glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE)
+            img = Devil.from_blob(data, self.width, self.height)
+        end
+        
+        img
+    end
+end
+
+class Devil::Image
+
+    # convert a Devil::Image to a Gosu::Image.
+    # Must provide a +window+ parameter, as per Gosu::Image#new()
+    def to_gosu(window)
+        Gosu::Image.new(window, self)
+    end
+    
+    # display the Devil images on screen utilizing the Gosu library for visualization
+    # if +x+ and +y+ are specified then show the image centered at this location, otherwise
+    # draw the image at the center of the screen 
+    # This method is only available if require 'devil/gosu' is used
+    def show(x = 512, y = 384)
+        if !Devil.const_defined?(:Window)
+            c = Class.new(Gosu::Window) do
+                attr_accessor :show_list
+                
+                def initialize
+                    super(1024, 768, false)
+                    @show_list = []
+                end
+
+                def draw    # :nodoc:
+                    @show_list.each { |v| v[:image].draw_rot(v[:x], v[:y], 1, 0) }
+                end
+            end
+
+            Devil.const_set :Window, c
+        end
+        
+        if !defined? @@window
+            @@window ||= Devil::Window.new
+
+            at_exit { @@window.show }
+        end
+        
+        @@window.show_list.push :image => Gosu::Image.new(@@window, self), :x => x, :y => y
+    end
+
+end

data/test/test_clone_and_crop.rb

@@ -0,0 +1,25 @@
+direc = File.dirname(__FILE__)
+
+$LOAD_PATH.push("#{direc}/../lib/")
+
+require 'rubygems'
+require "devil/gosu"
+
+img = Devil.load_image("#{direc}/texture.png") 
+
+img.crop(100,100, 200, 200)
+img_dup = img.dup
+
+img.negative
+
+img.show(200,200)
+img_dup.show(450, 200)
+
+
+
+
+
+
+                   
+
+

data/test/test_gosu_load.rb

@@ -0,0 +1,26 @@
+$direc = File.dirname(__FILE__)
+
+$LOAD_PATH.push("#{$direc}/../lib/")
+
+require 'rubygems'
+require 'gosu'
+require 'devil'
+
+class W < Gosu::Window
+    def initialize
+        super(1024, 768, false, 20)
+
+        img = Devil.load_image("#{$direc}/texture.jpg")
+
+        @img = Gosu::Image.new(self, img)
+    end
+    
+    def draw
+        @img.draw 100, 50,1
+    end
+    
+end
+
+w = W.new
+w.show
+        

data/test/test_gosu_save.rb

@@ -0,0 +1,26 @@
+$direc = File.dirname(__FILE__)
+
+$LOAD_PATH.push("#{$direc}/../lib/")
+
+require 'rubygems'
+require 'devil/gosu'
+
+class W < Gosu::Window
+    def initialize
+        super(1024, 768, false, 20)
+
+        @img = Gosu::Image.new(self, "tank.png")
+        @img.circle 100, 100, 50, :color => :purple, :filled => true
+
+        @img.save("tank-modified.png")
+    end
+    
+    def draw
+        @img.draw 100, 50,1
+    end
+    
+end
+
+w = W.new
+w.show
+        

data/test/test_gosu_show.rb

@@ -0,0 +1,10 @@
+$direc = File.dirname(__FILE__)
+
+$LOAD_PATH.push("#{$direc}/../lib/")
+
+require 'rubygems'
+require 'devil/gosu'
+
+Devil.load_image("texture.png").show(512, 400)
+Devil.load_image("tank.png").show(300, 400)
+

data/test/test_new_api.rb

@@ -1,8 +1,9 @@
 direc = File.dirname(__FILE__)
 
-require 'rubygems'
-require "#{direc}/../lib/devil"
+$LOAD_PATH.push("#{direc}/../lib/")
 
+require 'rubygems'
+require "devil"
 
 Devil.load_image("#{direc}/texture.png") do |img|
     img.negative

data/test/test_screenshot.rb

@@ -0,0 +1,33 @@
+$direc = File.dirname(__FILE__)
+
+$LOAD_PATH.push("#{$direc}/../lib/")
+
+require 'rubygems'
+require 'devil/gosu'
+
+class W < Gosu::Window
+    def initialize
+        super(1024, 768, false, 20)
+
+        @img = Gosu::Image.new(self, "tank.png")
+        @img2 = @img.dup
+        @img.circle 100, 100, 50, :color => :purple, :filled => true
+    end
+    
+    def draw
+        @img.draw 100, 50,1
+        @img.draw 300, 50, 1
+        @img2.draw 300, 400, 1
+    end
+
+    def update
+        if button_down?(Gosu::KbEscape)
+            screenshot.rotate(45).save("screenshot.png")
+            exit
+        end
+    end
+end
+
+w = W.new
+w.show
+        

data/test/test_thumbnail.rb

@@ -1,20 +1,12 @@
-require 'rubygems'
-require 'devil'
-
-IL.Init
-
-name = IL.GenImages(1)[0]
-IL.BindImage(name)
-IL.LoadImage("texture.png")
+$direc = File.dirname(__FILE__)
 
-puts "image height/width"
-puts IL.GetInteger(IL::IMAGE_WIDTH)
-puts IL.GetInteger(IL::IMAGE_HEIGHT)
+$LOAD_PATH.push("#{$direc}/../lib/")
 
-ILU.Scale(100, 100, 1)
-
-IL.Enable(IL::FILE_OVERWRITE)
-
-IL.SaveImage("desert_thumb.png")
+require 'rubygems'
+require 'devil/gosu'
 
+Devil.load("texture.png") do |img|
+    img.thumbnail(300)
+    img.show
+end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devil
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jaroslaw Tworek, John Mair (banisterfiend)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 -04:00
+date: 2009-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -26,13 +26,22 @@ files:
 - README
 - LICENSE
 - lib/devil.rb
+- lib/devil/gosu.rb
 - ext/devil/extconf.rb
 - ext/devil/ruby_devil_ext.h
 - ext/devil/ruby_devil_ext.c
 - ext/devil/ruby_il.c
 - ext/devil/ruby_ilu.c
+- test/test_gosu_load.rb
 - test/test_new_api.rb
+- test/test_clone_and_crop.rb
+- test/test_gosu_show.rb
+- test/test_screenshot.rb
+- test/test_gosu_save.rb
 - test/test_thumbnail.rb
+- test/tank.png
+- test/texture.png
+- test/texture.jpg
 has_rdoc: true
 homepage: http://banisterfiend.wordpress.com
 post_install_message: