devil 0.1.8.8-x86-mswin32-60 → 0.1.9.0-x86-mswin32-60

data/README

@@ -1,4 +1,4 @@
-Ruby Devil version 0.1.8.8
+Ruby Devil version 0.1.9.0
 ========================
 
 * Original author: Jaroslaw Tworek <dev.jrx@gmail.com>

data/Rakefile

@@ -8,7 +8,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-DEVIL_VERSION = "0.1.8.8"
+DEVIL_VERSION = "0.1.9.0"
 
 dlext = Config::CONFIG['DLEXT']
 

data/ext/devil/extconf.rb

@@ -1,23 +1,27 @@
-require 'mkmf'
-
-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/'
-elsif RUBY_PLATFORM =~ /darwin/
-
-    # this only works if you install devil via macports
-    $CFLAGS += ' -I/opt/local/include/'
-    $LDFLAGS += ' -L/opt/local/lib/'
-end
-
-if RUBY_PLATFORM =~ /(win32|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')
+require 'mkmf'
+
+if RUBY_PLATFORM =~ /mingw|win32/
+    $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("glut32")
+    exit unless have_library("DevIL")
+    
+elsif RUBY_PLATFORM =~ /darwin/
+
+    # this only works if you install devil via macports
+    $CFLAGS += ' -I/opt/local/include/ -I/System/Library/Frameworks/GLUT.framework/Headers'
+    $LDFLAGS += ' -L/opt/local/lib/ -framework GLUT'
+    exit unless have_library("IL")
+
+elsif RUBY_PLATFORM =~ /linux/
+    exit unless have_library("IL")
+
+    exit unless have_library("glut")
+    exit unless have_library("GL")
+end
+
+# all platforms
+exit unless have_library("ILU")
+exit unless have_library("ILUT")
+
+create_makefile('devil')

data/ext/devil/ruby_devil_ext.c

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

data/ext/devil/ruby_ilut.c

@@ -0,0 +1,98 @@
+#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) {
+    GLuint 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 = StringValuePtr(rb_FileName);
+    ILuint 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));
+}

data/lib/devil.rb

@@ -19,7 +19,7 @@ module Devil
     include IL
     include ILU
 
-    VERSION = '0.1.8.8'
+    VERSION = '0.1.9.0'
     
     class << self
 
@@ -35,23 +35,9 @@ module Devil
             # apply a color profile if one is provided
             IL.ApplyProfile(in_profile, out_profile) if out_profile
 
-            # run the load image hook (if it exists)
             check_and_run_hook(:load_image_hook)
-            
             error_check
-     
-            img = Image.new(name, file)
-            if block
-                begin
-                    block.call(img)
-                ensure
-                    # don't bother freeing it if it's already free
-                    img.free if img.name
-                end
-            else
-                # ObjectSpace.define_finalizer(img, proc { IL.DeleteImages([img.name]) if img.name })
-                img
-            end
+            wrap_and_yield(name, file, block)
         end
 
         alias_method :with_image, :load_image
@@ -78,22 +64,9 @@ module Devil
             IL.ClearImage
             IL.ClearColour(*Devil.get_options[:clear_color]) if clear_color
 
-            # run the create image hook (if it exists)
             check_and_run_hook(:create_image_hook)
-            
             error_check
-            
-            img = Image.new(name, nil)
-            if block
-                begin
-                    block.call(img)
-                ensure
-                    img.free if img.name
-                end
-            else
-                # ObjectSpace.define_finalizer(img, proc { IL.DeleteImages([img.name]) if img.name })
-                img
-            end
+            wrap_and_yield(name, nil, block)
         end
 
         alias_method :create_blank_image, :create_image
@@ -219,7 +192,6 @@ module Devil
             name = IL.GenImages(1).first
             IL.BindImage(name)
 
-            # run the prepare image hook (if it exists)
             check_and_run_hook(:prepare_image_hook)
 
             name
@@ -232,6 +204,19 @@ module Devil
             IL.ConvertImage(IL::RGBA, IL::UNSIGNED_BYTE)
         end
 
+        def wrap_and_yield(name, file, block)
+            img = Image.new(name, file)
+            if block
+                begin
+                    block.call(img)
+                ensure
+                    img.free if img.name
+                end
+            else
+                img
+            end            
+        end
+
         def check_and_run_hook(hook_name)
             Devil.get_options[hook_name].call if Devil.get_options[hook_name]
         end

data/test/test_ilut.rb

@@ -0,0 +1,95 @@
+# this test is a hold over from the original ruby-devil bindings (by Jaroslaw Tworek)
+
+$direc = File.dirname(__FILE__)
+
+$LOAD_PATH.push("#{$direc}/../lib/")
+
+require 'rubygems'
+require 'glut'
+require 'opengl'
+require 'devil'
+require 'thread'
+
+$tex_id = 0
+
+$idle = proc {
+    GLUT.PostRedisplay
+}
+
+$display = proc {
+    GL.Clear(GL::COLOR_BUFFER_BIT | GL::DEPTH_BUFFER_BIT)
+    GL.LoadIdentity
+    GLU.LookAt(0,0,-5,0,0,0,0,1,0)
+
+    GL.Begin GL::QUADS
+
+
+    GL.TexCoord(1,0)
+    GL.Vertex(1, 1,0)
+    GL.TexCoord(1,1)
+    GL.Vertex(1, -1,0)
+    GL.TexCoord(0,1)
+    GL.Vertex(-1, -1,0)
+    GL.TexCoord(0,0)
+    GL.Vertex(-1, 1,0)
+
+    GL.End
+
+    GLUT.SwapBuffers
+}
+
+$reshape = proc { |w,h|
+    GL.Viewport(0,0,w,h)
+    GL.MatrixMode(GL::PROJECTION)
+    GL.LoadIdentity
+    GLU.Perspective(45.0, Float(w)/h, 0.01, 100)
+    GL.MatrixMode(GL::MODELVIEW)
+    GL.LoadIdentity
+}
+
+def setup_gl
+    GL.ClearColor( 0,0,0,1)
+    IL.Init
+    ILUT.Renderer(ILUT::OPENGL)
+    GL.Enable(GL::DEPTH_TEST)
+    GL.DrawBuffer(GL::BACK)
+    GL.Disable(GL::CULL_FACE)
+    GL.ShadeModel(GL::FLAT)
+    GL.Enable(GL::TEXTURE_2D)
+
+    name = IL.GenImages(1)[0]
+    IL.BindImage(name)
+
+    if File.directory?("test") then
+    	if !File.exist?("test/texture.png") then
+    	    raise RuntimeError, "File test/texture.png doesn't exist"
+    	end
+	IL.LoadImage("test/texture.png")
+    else
+    	if !File.exist?("texture.png") then
+    	    raise RuntimeError, "File texture.png doesn't exist"
+    	end
+	IL.LoadImage("texture.png")
+    end
+
+    $tex_id = ILUT.GLBindMipmaps()
+    IL.DeleteImages([name])
+    
+
+end
+
+def main
+    GLUT.Init
+    GLUT.InitDisplayMode(GLUT::DOUBLE | GLUT::RGB | GLUT::DEPTH)
+    GLUT.InitWindowSize(800,600)
+    GLUT.CreateWindow("Ruby-DevIL test")
+    setup_gl
+    GLUT.DisplayFunc($display)
+    GLUT.ReshapeFunc($reshape)
+    GLUT.IdleFunc($idle)
+    GLUT.MainLoop
+    
+    
+end
+
+main

data/test/test_thumbnail.rb

@@ -6,7 +6,7 @@ require 'rubygems'
 require 'devil/gosu'
 
 Devil.load("texture.png") do |img|
-    img.dup.thumbnail(150, :filter => Devil::NEAREST).show(100, 300).free
-    img.dup.thumbnail(150).show(100, 100).free
+    img.dup.thumbnail(100, :filter => Devil::NEAREST).show(200, 300).free
+    img.dup.thumbnail(100).show(200, 500).free
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devil
 version: !ruby/object:Gem::Version 
-  version: 0.1.8.8
+  version: 0.1.9.0
 platform: x86-mswin32-60
 authors: 
 - Jaroslaw Tworek, John Mair (banisterfiend)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 +13:00
+date: 2009-11-10 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - ext/devil/ruby_devil_ext.c
 - ext/devil/ruby_il.c
 - ext/devil/ruby_ilu.c
+- ext/devil/ruby_ilut.c
 - test/test_blank.rb
 - test/test_blit.rb
 - test/test_clone_and_crop.rb
@@ -41,6 +42,7 @@ files:
 - test/test_gosu_save.rb
 - test/test_gosu_show.rb
 - test/test_group.rb
+- test/test_ilut.rb
 - test/test_new_api.rb
 - test/test_profile.rb
 - test/test_scale_algos.rb