devil 0.1.0 → 0.1.1

data/README

@@ -1,4 +1,4 @@
-Devil version 0.1.0
+Devil version 0.1.1
 
 * Original author: Jaroslaw Tworek <dev.jrx@gmail.com>
 * Current maintainer: John Mair (banisterfiend) http://banisterfiend.wordpress.com

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-DEVIL_VERSION = "0.1.0"
+DEVIL_VERSION = "0.1.1"
 
 dlext = Config::CONFIG['DLEXT']
 
@@ -27,7 +27,7 @@ spec = Gem::Specification.new do |s|
     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"].to_a
+        FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "test/test*.rb"].to_a
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/ext/devil/extconf.rb

@@ -1,7 +1,9 @@
 require 'mkmf'
 
-have_library("IL", "ilInit");
-have_library("ILU", "iluInit");
-have_library("ILUT", "ilutInit");
+#$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");
+#have_library("ILUT", "ilutInit");
 
 create_makefile('devil')

data/ext/devil/ruby_devil_ext.c

@@ -5,5 +5,7 @@ void
 Init_devil() {
     InitializeIL();
     InitializeILU();
-    InitializeILUT();
+
+    /* turning off ILUT layer */
+    /*    InitializeILUT(); */
 }

data/ext/devil/ruby_devil_ext.h

@@ -6,4 +6,6 @@ typedef struct RArray RArray;
 
 extern void InitializeIL();
 extern void InitializeILU();
-extern void InitializeILUT();
+
+/* turning off ILUT layer */
+/*extern void InitializeILUT(); */

data/lib/devil.rb

@@ -14,7 +14,7 @@ end
 
 # Provides a high level wrapper for the low-level DevIL Ruby bindings
 module Devil
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
     
     # loads +file+ and returns a new image
     # Optionally accepts a block and yields the newly created image to the block.

data/test/test_new_api.rb

@@ -0,0 +1,24 @@
+direc = File.dirname(__FILE__)
+
+require 'rubygems'
+require "#{direc}/../lib/devil"
+
+
+Devil.load_image("#{direc}/texture.png") do |img|
+    img.negative
+    img.save("#{direc}/texture_neg.png")
+end
+
+img = Devil.load_image("#{direc}/texture.png")
+bink = Devil.load_image("#{direc}/texture.png")
+
+img.gamma_correct(1.6)
+bink.resize(50, 50)
+
+img.save("#{direc}/texture_blur.png")
+bink.save("#{direc}/texture_tiny.png")
+
+
+                   
+
+

data/test/test_thumbnail.rb

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'devil'
+
+IL.Init
+
+name = IL.GenImages(1)[0]
+IL.BindImage(name)
+IL.LoadImage("texture.png")
+
+puts "image height/width"
+puts IL.GetInteger(IL::IMAGE_WIDTH)
+puts IL.GetInteger(IL::IMAGE_HEIGHT)
+
+ILU.Scale(100, 100, 1)
+
+IL.Enable(IL::FILE_OVERWRITE)
+
+IL.SaveImage("desert_thumb.png")
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devil
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jaroslaw Tworek, John Mair (banisterfiend)
@@ -28,10 +28,11 @@ files:
 - lib/devil.rb
 - ext/devil/extconf.rb
 - ext/devil/ruby_devil_ext.h
-- ext/devil/ruby_ilut.c
 - ext/devil/ruby_devil_ext.c
 - ext/devil/ruby_il.c
 - ext/devil/ruby_ilu.c
+- test/test_new_api.rb
+- test/test_thumbnail.rb
 has_rdoc: true
 homepage: http://banisterfiend.wordpress.com
 post_install_message: 

data/ext/devil/ruby_ilut.c

@@ -1,98 +0,0 @@
-#include <ruby.h>
-#include <IL/ilut.h>
-#include "ruby_devil_ext.h"
-
-static VALUE mILUT;
-
-static VALUE ilut_Renderer(VALUE obj, VALUE ilut_enum) {
-    ILenum renderer = NUM2INT(ilut_enum);
-    ilutRenderer(renderer);
-    return Qnil;
-}
-
-static VALUE ilut_Enable(VALUE obj, VALUE rb_Mode) {
-    ILenum Mode = NUM2INT(rb_Mode);
-    ILboolean flag = ilutEnable(Mode);
-    return flag ? Qtrue : Qfalse;
-}
-
-static VALUE ilut_GLTexImage(VALUE obj, VALUE rb_Level) {
-    ILuint Level = NUM2INT(rb_Level);
-    ILboolean flag = ilutGLTexImage(Level);
-    return flag ? Qtrue : Qfalse;
-}
-
-static VALUE ilut_GLBindTexImage(VALUE obj) {
-    GLuint ret = ilutGLBindTexImage();
-    return INT2FIX(ret);
-}
-
-static VALUE ilut_GLBuildMipmaps(VALUE obj) {
-    ILboolean flag = ilutGLBuildMipmaps();
-    return flag ? Qtrue : Qfalse;
-}
-
-static VALUE ilut_GLBindMipmaps(VALUE obj) {
-    ILuint ret = ilutGLBindMipmaps();
-    return INT2FIX(ret);
-}
-
-static VALUE ilut_GLLoadImage(VALUE obj, VALUE rb_FileName) {
-    const ILstring FileName = STR2CSTR(rb_FileName);
-    GLuint ret = ilutGLLoadImage(FileName);
-    return INT2FIX(ret);
-}
-
-static VALUE ilut_GLScreen(VALUE obj) {
-    ILboolean flag = ilutGLScreen();
-    return flag ? Qtrue : Qfalse;
-}
-
-static VALUE ilut_GLScreenie(VALUE obj) {
-    ILboolean flag = ilutGLScreenie();
-    return flag ? Qtrue : Qfalse;
-}
-
-
-
-void 
-InitializeILUT() {
-    mILUT = rb_define_module("ILUT");
-    //////////////////////////////////
-    //METHODS
-    //////////////////////////////////
-    rb_define_module_function(mILUT, "Renderer", ilut_Renderer, 1);
-    rb_define_module_function(mILUT, "Enable", ilut_Enable , 1);
-    rb_define_module_function(mILUT, "GLTexImage", ilut_GLTexImage, 1);
-    rb_define_module_function(mILUT, "GLBindTexImage", ilut_GLBindTexImage, 0);
-    rb_define_module_function(mILUT, "GLBuildMipmaps", ilut_GLBuildMipmaps , 0);
-    rb_define_module_function(mILUT, "GLBindMipmaps", ilut_GLBindMipmaps , 0);
-    rb_define_module_function(mILUT, "GLLoadImage", ilut_GLLoadImage, 1);
-    rb_define_module_function(mILUT, "GLScreen", ilut_GLScreen , 1);
-    rb_define_module_function(mILUT, "GLScreenie", ilut_GLScreenie , 1);
-
-    //////////////////////////////////
-    //CONSTANTS
-    //////////////////////////////////
-    rb_define_const(mILUT, "OPENGL", INT2NUM(ILUT_OPENGL));
-    rb_define_const(mILUT, "ALLEGRO", INT2NUM(ILUT_ALLEGRO));
-    rb_define_const(mILUT, "WIN32", INT2NUM(ILUT_WIN32));
-    rb_define_const(mILUT, "DIRECT3D8", INT2NUM(ILUT_DIRECT3D8));
-    rb_define_const(mILUT, "DIRECT3D9", INT2NUM(ILUT_DIRECT3D9));
-
-    rb_define_const(mILUT, "PALETTE_MODE", INT2NUM(ILUT_PALETTE_MODE));
-    rb_define_const(mILUT, "OPENGL_CONV", INT2NUM(ILUT_OPENGL_CONV));
-    rb_define_const(mILUT, "D3D_MIPLEVELS", INT2NUM(ILUT_D3D_MIPLEVELS));
-    rb_define_const(mILUT, "MAXTEX_WIDTH", INT2NUM(ILUT_MAXTEX_WIDTH));
-    rb_define_const(mILUT, "MAXTEX_HEIGHT", INT2NUM(ILUT_MAXTEX_HEIGHT));
-    rb_define_const(mILUT, "MAXTEX_DEPTH", INT2NUM(ILUT_MAXTEX_DEPTH));
-    rb_define_const(mILUT, "GL_USE_S3TC", INT2NUM(ILUT_GL_USE_S3TC));
-    rb_define_const(mILUT, "D3D_USE_DXTC", INT2NUM(ILUT_D3D_USE_DXTC));
-    rb_define_const(mILUT, "GL_GEN_S3TC", INT2NUM(ILUT_GL_GEN_S3TC));
-    rb_define_const(mILUT, "D3D_GEN_DXTC", INT2NUM(ILUT_D3D_GEN_DXTC));
-    rb_define_const(mILUT, "S3TC_FORMAT", INT2NUM(ILUT_S3TC_FORMAT));
-    rb_define_const(mILUT, "DXTC_FORMAT", INT2NUM(ILUT_DXTC_FORMAT));
-    rb_define_const(mILUT, "D3D_POOL", INT2NUM(ILUT_D3D_POOL));
-    rb_define_const(mILUT, "D3D_ALPHA_KEY_COLOR", INT2NUM(ILUT_D3D_ALPHA_KEY_COLOR));
-    rb_define_const(mILUT, "D3D_ALPHA_KEY_COLOUR", INT2NUM(ILUT_D3D_ALPHA_KEY_COLOUR));
-}