glfw 0.9.8 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3ca1a58ecdbd6b33d8c6ae549554cff5c9da32fd
-  data.tar.gz: 5ebe2f5f8650ba1dd778011adee4cb2504f32fc0
+SHA256:
+  metadata.gz: e4ede14d21b049d041c7cc4b79463a951731d7af44f9af89aad9124d27b7add9
+  data.tar.gz: 90245e05d8b2fabdc2bf78e1792152a45e51fdf9a8f05bd2cfaf4378604d1b61
 SHA512:
-  metadata.gz: df2b8b789740aa1809b3d109c25f57eb5b004dbb9cd74f722c76cc2d8d980d3ae71debbed6e27e9b91fec0aa7a4872d4ea03ca4747efebc453f9c548ecc630e0
-  data.tar.gz: a9eaa3be251a8ab64fa5e77e656a473a082e29bb79e596fbf4b9d49d5d81acc794655853bcf71fef2a66837d7aa26333ca96cdbf02b6136bed518564467ea782
+  metadata.gz: b2b4fa2073d1733eba7ddd64215eb3cb3c33c02a64abc6652f249ac724e91e2218be5d365dd0739daec1314a7079585bd8bb132f2226e14bb96e1ce9ec1eaa8b
+  data.tar.gz: cb8ba44a0117051eba24e512afe19b7822cb1983d6eb6201a0daeea227aab66457f8229eecaeeea736cf70bc31056ff907b40f6b17f46aaf4344ace2ab9b63b1

data/Makefile

@@ -122,8 +122,8 @@ TOUCH = exit >
 #### End of system configuration section. ####
 
 preload = 
-libpath = . $(libdir) C:/Ruby24/lib c:/Users/Eric/OneDrive/Documents/RubymineProjects/glfw/ext/glfw/lib
-LIBPATH =  -L. -L$(libdir) -LC:/Ruby24/lib -Lc:/Users/Eric/OneDrive/Documents/RubymineProjects/glfw/ext/glfw/lib
+libpath = . $(libdir) C:/Ruby24/lib c:/Users/Eric/OneDrive/Documents/RubymineProjects/glfw/ext/glfw/ming32
+LIBPATH =  -L. -L$(libdir) -LC:/Ruby24/lib -Lc:/Users/Eric/OneDrive/Documents/RubymineProjects/glfw/ext/glfw/ming32
 DEFFILE = $(TARGET)-$(arch).def
 
 CLEANFILES = mkmf.log $(DEFFILE)
@@ -133,7 +133,7 @@ DISTCLEANDIRS =
 extout = 
 extout_prefix = 
 target_prefix = /glfw
-LOCAL_LIBS = -lglfw3 -lgdi32 -lopengl32 
+LOCAL_LIBS = -lglfw3 -lgdi32 -lopengl32
 LIBS = $(LIBRUBYARG_SHARED)  -lgmp -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi  
 ORIG_SRCS = cursor.c glfw.c image.c monitor.c video_mode.c vulkan.c window.c
 SRCS = $(ORIG_SRCS) 

data/README.md

@@ -1,10 +1,13 @@
 # ![icon](./glfw-icon.png) GLFW
 
-This is a Ruby C-extension that for the excellent [GLFW](https://github.com/glfw/glfw) library. Unlike other bindings, this gem goes beyond just providing a 1:1 wrapper of the functions, and has been organized to be used in a more object-oriented, Ruby way. Being statically linked with the included object file during compilation alleviates any headaches with regards to versioning or dependencies, as none are required for this gem.
+This is a Ruby C-extension that for the excellent [GLFW](https://github.com/glfw/glfw) library. Unlike other bindings, this gem goes beyond just providing a 1:1 wrapper of the functions, and has been organized to be used in a more object-oriented, Ruby way.
 
 ## Installation
 
-One of the other advantages this gem offers is that it does not require external dependencies, not even the GLFW3 API. Instead of linking to an extisting library, the gem includes the headers and `glfw3.a` static library to compile against during installation. This offers a much easier, more consistent installation process, without the end-user required to ensure any pre-existing files are properly installed, or concern over versions. As the API the gem is based quite stable and mature, new realeases are uncommon, though this gem will update as they become available to provide the latest version.
+For Windows user, you can download the pre-built binaries at [here](https://www.glfw.org/download.html) for your target architecture, or both. Place these within the their respective folders withing the `ext/glfw/` directory.
+
+For Unix users, simply have GLFW installed globally, and it will be found and linked against during the build process.
+
 
 ### From [RubyGems.org](https://rubygems.org/gems/glfw)
 

data/Rakefile

@@ -1,12 +1,3 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
 require "rake/extensiontask"
 
 task :build => :compile

data/ext/glfw/common.h

@@ -1,46 +1,46 @@
-
-
-#ifndef GLFW_RB_COMMON_H
-#define GLFW_RB_COMMON_H 1
-
-#include "glfw3.h"
-#include "ruby.h"
-
-#define STR2SYM(str) ID2SYM(rb_intern(str))
-
-#define INT2BOOL(i) (i ? Qtrue : Qfalse)
-
-#define WINDOW()   \
-    GLFWwindow *w; \
-    Data_Get_Struct(self, GLFWwindow, w)
-
-enum GLFW_RB_CALLBACK_TYPE {
-    GLFW_RB_MOVED,
-    GLFW_RB_RESIZED,
-    GLFW_RB_FRAMEBUFFER_RESIZED,
-    GLFW_RB_CLOSING,
-    GLFW_RB_REFRESHED,
-    GLFW_RB_FOCUS_CHANGED,
-    GLFW_RB_MINIMIZE_CHANGED,
-    GLFW_RB_MOUSE_MOVE,
-    GLFW_RB_MOUSE_SCROLL,
-    GLFW_RB_MOUSE_BUTTON,
-    GLFW_RB_MOUSE_ENTER,
-    GLFW_RB_KEY,
-    GLFW_RB_CHAR,
-    GLFW_RB_CHAR_MODS,
-    GLFW_RB_FILE_DROP,
-    GLFW_RB_MONITOR,
-    GLFW_RB_JOYSTICK
-} GLFW_RB_CALLBACK_TYPE;
-
-extern VALUE rb_mGLFW;
-extern VALUE rb_eGLFWError;
-extern VALUE rb_cGLFWwindow;
-extern VALUE rb_cGLFWmonitor;
-extern VALUE rb_cGLFWvidmode;
-extern VALUE rb_cGLFWimage;
-extern VALUE rb_cGLFWcursor;
-extern VALUE rb_cGLFWvulkan;
-
+
+
+#ifndef GLFW_RB_COMMON_H
+#define GLFW_RB_COMMON_H 1
+
+#include "glfw3.h"
+#include "ruby.h"
+
+#define STR2SYM(str) ID2SYM(rb_intern(str))
+
+#define INT2BOOL(i) (i ? Qtrue : Qfalse)
+
+#define WINDOW()   \
+    GLFWwindow *w; \
+    Data_Get_Struct(self, GLFWwindow, w)
+
+enum GLFW_RB_CALLBACK_TYPE {
+    GLFW_RB_MOVED,
+    GLFW_RB_RESIZED,
+    GLFW_RB_FRAMEBUFFER_RESIZED,
+    GLFW_RB_CLOSING,
+    GLFW_RB_REFRESHED,
+    GLFW_RB_FOCUS_CHANGED,
+    GLFW_RB_MINIMIZE_CHANGED,
+    GLFW_RB_MOUSE_MOVE,
+    GLFW_RB_MOUSE_SCROLL,
+    GLFW_RB_MOUSE_BUTTON,
+    GLFW_RB_MOUSE_ENTER,
+    GLFW_RB_KEY,
+    GLFW_RB_CHAR,
+    GLFW_RB_CHAR_MODS,
+    GLFW_RB_FILE_DROP,
+    GLFW_RB_MONITOR,
+    GLFW_RB_JOYSTICK
+} GLFW_RB_CALLBACK_TYPE;
+
+extern VALUE rb_mGLFW;
+extern VALUE rb_eGLFWError;
+extern VALUE rb_cGLFWwindow;
+extern VALUE rb_cGLFWmonitor;
+extern VALUE rb_cGLFWvidmode;
+extern VALUE rb_cGLFWimage;
+extern VALUE rb_cGLFWcursor;
+extern VALUE rb_cGLFWvulkan;
+
 #endif /* GLFW_RB_COMMON_H */

data/ext/glfw/cursor.c

@@ -1,42 +1,42 @@
-
-#include "cursor.h"
-
-VALUE rb_cGLFWcursor;
-
-void Init_glfw_cursor(VALUE module) {
-    rb_cGLFWcursor = rb_define_class_under(module, "Cursor", rb_cObject);
-    rb_define_alloc_func(rb_cGLFWcursor, rb_glfw_cursor_alloc);
-    
-    rb_define_method(rb_cGLFWcursor, "initialize", rb_glfw_cursor_initialize, 3);
-    rb_define_method(rb_cGLFWcursor, "destroy", rb_glfw_cursor_destroy, 0);
-
-    rb_define_alias(rb_cGLFWcursor, "dispose", "destroy");
-
-    rb_define_singleton_method(rb_cGLFWcursor, "create", rb_glfw_cursor_standard, 1);
-}
-
-static VALUE rb_glfw_cursor_alloc(VALUE klass) {
-    GLFWcursor *c = ruby_xmalloc(SIZEOF_INTPTR_T);
-    memset(c, 0, SIZEOF_INTPTR_T);
-    return Data_Wrap_Struct(klass, NULL, RUBY_DEFAULT_FREE, c);
-}
-
-VALUE rb_glfw_cursor_initialize(VALUE self, VALUE image, VALUE xhot, VALUE yhot) {
-    GLFWimage *img;
-    Data_Get_Struct(image, GLFWimage, img);
-    RDATA(self)->data = glfwCreateCursor(img, NUM2INT(xhot), NUM2INT(yhot));
-    return Qnil;
-}
-
-VALUE rb_glfw_cursor_standard(VALUE klass, VALUE shape) {
-    GLFWcursor *cursor = glfwCreateStandardCursor(NUM2INT(shape));
-    return Data_Wrap_Struct(klass, NULL, RUBY_DEFAULT_FREE, cursor);
-}
-
-VALUE rb_glfw_cursor_destroy(VALUE self) {
-    GLFWcursor *cursor;
-    Data_Get_Struct(self, GLFWcursor, cursor);
-
-    glfwDestroyCursor(cursor);
-    return Qnil;
-}
+
+#include "cursor.h"
+
+VALUE rb_cGLFWcursor;
+
+void Init_glfw_cursor(VALUE module) {
+    rb_cGLFWcursor = rb_define_class_under(module, "Cursor", rb_cObject);
+    rb_define_alloc_func(rb_cGLFWcursor, rb_glfw_cursor_alloc);
+    
+    rb_define_method(rb_cGLFWcursor, "initialize", rb_glfw_cursor_initialize, 3);
+    rb_define_method(rb_cGLFWcursor, "destroy", rb_glfw_cursor_destroy, 0);
+
+    rb_define_alias(rb_cGLFWcursor, "dispose", "destroy");
+
+    rb_define_singleton_method(rb_cGLFWcursor, "create", rb_glfw_cursor_standard, 1);
+}
+
+static VALUE rb_glfw_cursor_alloc(VALUE klass) {
+    GLFWcursor *c = ruby_xmalloc(SIZEOF_INTPTR_T);
+    memset(c, 0, SIZEOF_INTPTR_T);
+    return Data_Wrap_Struct(klass, NULL, RUBY_DEFAULT_FREE, c);
+}
+
+VALUE rb_glfw_cursor_initialize(VALUE self, VALUE image, VALUE xhot, VALUE yhot) {
+    GLFWimage *img;
+    Data_Get_Struct(image, GLFWimage, img);
+    RDATA(self)->data = glfwCreateCursor(img, NUM2INT(xhot), NUM2INT(yhot));
+    return Qnil;
+}
+
+VALUE rb_glfw_cursor_standard(VALUE klass, VALUE shape) {
+    GLFWcursor *cursor = glfwCreateStandardCursor(NUM2INT(shape));
+    return Data_Wrap_Struct(klass, NULL, RUBY_DEFAULT_FREE, cursor);
+}
+
+VALUE rb_glfw_cursor_destroy(VALUE self) {
+    GLFWcursor *cursor;
+    Data_Get_Struct(self, GLFWcursor, cursor);
+
+    glfwDestroyCursor(cursor);
+    return Qnil;
+}

data/ext/glfw/cursor.h

@@ -1,14 +1,14 @@
-
-#ifndef GLFW_RB_CURSOR_H
-#define GLFW_RB_CURSOR_H 1
-
-#include "common.h"
-#include "image.h"
-
-void Init_glfw_cursor(VALUE module);
-static VALUE rb_glfw_cursor_alloc(VALUE klass);
-VALUE rb_glfw_cursor_initialize(VALUE self, VALUE image, VALUE xhot, VALUE yhot);
-VALUE rb_glfw_cursor_standard(VALUE klass, VALUE shape);
-VALUE rb_glfw_cursor_destroy(VALUE self);
-
+
+#ifndef GLFW_RB_CURSOR_H
+#define GLFW_RB_CURSOR_H 1
+
+#include "common.h"
+#include "image.h"
+
+void Init_glfw_cursor(VALUE module);
+static VALUE rb_glfw_cursor_alloc(VALUE klass);
+VALUE rb_glfw_cursor_initialize(VALUE self, VALUE image, VALUE xhot, VALUE yhot);
+VALUE rb_glfw_cursor_standard(VALUE klass, VALUE shape);
+VALUE rb_glfw_cursor_destroy(VALUE self);
+
 #endif /* GLFW_RB_CURSOR_H */

data/ext/glfw/extconf.rb

@@ -1,24 +1,21 @@
 require "mkmf"
 
-LIBDIR     = RbConfig::CONFIG['libdir']
-INCLUDEDIR = RbConfig::CONFIG['includedir']
 
-HEADER_DIRS = [INCLUDEDIR, File.dirname(__FILE__)]
+headers = [RbConfig::CONFIG['includedir'], File.dirname(__FILE__)]
+libdirs = [RbConfig::CONFIG['libdir']]
 
-# TODO: x86 or x86-64 (ming)
+dir = 0.size == 4 ? 'ming32' : 'ming64'
+libdirs << File.expand_path(File.join(File.dirname(__FILE__), dir))
 
-
-# setup constant that is equal to that of the file path that holds that static libraries that will need to be compiled against
-LIB_DIRS = [LIBDIR, File.expand_path(File.join(File.dirname(__FILE__), "lib"))]
-
-# array of all libraries that the C extension should be compiled against
-libs = ['-lglfw3 -lgdi32 -lopengl32']
-
-dir_config('glfw', HEADER_DIRS, LIB_DIRS)
-
-# iterate though the libs array, and append them to the $LOCAL_LIBS array used for the makefile creation
-libs.each do |lib|
-  $LOCAL_LIBS << "#{lib} "
+case RbConfig::CONFIG['host_os']
+when /mingw/
+  $LOCAL_LIBS << '-lglfw3 -lgdi32 -lopengl32'
+when /darwin/
+  find_library("glfw", "glfwInit")
+when /linux/
+  find_library("glfw", "glfwInit")
 end
 
+dir_config('glfw', headers, libdirs)
+
 create_makefile("glfw/glfw")

data/ext/glfw/glfw.c

@@ -41,7 +41,7 @@ void Init_glfw(void) {
 
     // API Version 
     rb_define_const(rb_mGLFW, "API_VERSION", rb_sprintf("%d.%d.%d", 
-         INT2NUM(GLFW_VERSION_MAJOR),  INT2NUM(GLFW_VERSION_MINOR),  INT2NUM(GLFW_VERSION_REVISION)));
+         GLFW_VERSION_MAJOR,  GLFW_VERSION_MINOR,  GLFW_VERSION_REVISION));
     rb_define_const(rb_mGLFW, "API_VERSION_MAJOR", INT2NUM(GLFW_VERSION_MAJOR));
     rb_define_const(rb_mGLFW, "API_VERSION_MINOR", INT2NUM(GLFW_VERSION_MINOR));
     rb_define_const(rb_mGLFW, "API_VERSION_REVISION", INT2NUM(GLFW_VERSION_REVISION));
@@ -273,7 +273,7 @@ void Init_glfw(void) {
 }
 
 void rb_glfw_error_callback(int error, const char *message) {
-    rb_raise(rb_eGLFWError, message);
+    rb_raise(rb_eGLFWError, "%s", message);
 } 
 
 void rb_glfw_monitor_callback(GLFWmonitor *monitor, int connected) {

data/ext/glfw/image.c

@@ -1,77 +1,77 @@
-
-#include "image.h"
-
-VALUE rb_cGLFWimage;
-
-void Init_glfw_image(VALUE module) {
-    rb_cGLFWimage = rb_define_class_under(module, "Image", rb_cObject);
-    rb_define_alloc_func(rb_cGLFWimage, rb_glfw_image_alloc);
-    rb_define_method(rb_cGLFWimage, "initialize", rb_glfw_image_initialize, -1);
-    
-    rb_define_method(rb_cGLFWimage, "width", rb_glfw_image_width, 0);
-    rb_define_method(rb_cGLFWimage, "height", rb_glfw_image_height, 0);
-    rb_define_method(rb_cGLFWimage, "pixels", rb_glfw_image_pixels, 0);
-
-    rb_define_alias(rb_cGLFWimage, "columns", "width");
-    rb_define_alias(rb_cGLFWimage, "rows", "height");
-    rb_define_alias(rb_cGLFWimage, "to_blob", "pixels");
-}
-
-static VALUE rb_glfw_image_alloc(VALUE klass) {
-    GLFWimage *image = ALLOC(GLFWimage);
-    memset(image, 0, sizeof(GLFWimage));
-    return Data_Wrap_Struct(klass, NULL, RUBY_DEFAULT_FREE, image);
-}
-
-VALUE rb_glfw_image_initialize(int argc, VALUE *argv, VALUE self) {
-    if (argc == 2 || argc == 3)
-    {
-        GLFWimage *image = ALLOC(GLFWimage);
-        image->width = NUM2INT(argv[0]);
-        image->height = NUM2INT(argv[1]);
-
-        if (argc == 3)
-        {
-            if (RB_TYPE_P(argv[2], T_STRING))
-            {
-                image->pixels = StringValuePtr(argv[2]);
-            }
-            else 
-            {
-                uint32_t packed = NUM2UINT(argv[2]);
-                int size = sizeof(uint32_t) * image->width * image->height;
-                image->pixels = malloc(size);
-                memset(image->pixels, packed, size);
-            }
-        }
-        else
-        {
-            int size = 4 * image->width * image->height;
-            image->pixels = malloc(size);
-            memset(image->pixels, 0, size);
-        }
-        RDATA(self)->data = image;
-        return Qnil;
-    }
-
-    rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 2, 3)", argc);
-}
-
-VALUE rb_glfw_image_width(VALUE self) {
-    GLFWimage *image;
-    Data_Get_Struct(self, GLFWimage, image);
-    return INT2NUM(image->width);
-}
-
-VALUE rb_glfw_image_height(VALUE self) {
-    GLFWimage *image;
-    Data_Get_Struct(self, GLFWimage, image);
-    return INT2NUM(image->height);
-}
-
-VALUE rb_glfw_image_pixels(VALUE self) {
-    GLFWimage *image;
-    Data_Get_Struct(self, GLFWimage, image);
-    int size = image->width * image->height * 4;
-    return rb_str_new(image->pixels, size);
+
+#include "image.h"
+
+VALUE rb_cGLFWimage;
+
+void Init_glfw_image(VALUE module) {
+    rb_cGLFWimage = rb_define_class_under(module, "Image", rb_cObject);
+    rb_define_alloc_func(rb_cGLFWimage, rb_glfw_image_alloc);
+    rb_define_method(rb_cGLFWimage, "initialize", rb_glfw_image_initialize, -1);
+    
+    rb_define_method(rb_cGLFWimage, "width", rb_glfw_image_width, 0);
+    rb_define_method(rb_cGLFWimage, "height", rb_glfw_image_height, 0);
+    rb_define_method(rb_cGLFWimage, "pixels", rb_glfw_image_pixels, 0);
+
+    rb_define_alias(rb_cGLFWimage, "columns", "width");
+    rb_define_alias(rb_cGLFWimage, "rows", "height");
+    rb_define_alias(rb_cGLFWimage, "to_blob", "pixels");
+}
+
+static VALUE rb_glfw_image_alloc(VALUE klass) {
+    GLFWimage *image = ALLOC(GLFWimage);
+    memset(image, 0, sizeof(GLFWimage));
+    return Data_Wrap_Struct(klass, NULL, RUBY_DEFAULT_FREE, image);
+}
+
+VALUE rb_glfw_image_initialize(int argc, VALUE *argv, VALUE self) {
+    if (argc == 2 || argc == 3)
+    {
+        GLFWimage *image = ALLOC(GLFWimage);
+        image->width = NUM2INT(argv[0]);
+        image->height = NUM2INT(argv[1]);
+
+        if (argc == 3)
+        {
+            if (RB_TYPE_P(argv[2], T_STRING))
+            {
+                image->pixels = StringValuePtr(argv[2]);
+            }
+            else 
+            {
+                uint32_t packed = NUM2UINT(argv[2]);
+                int size = sizeof(uint32_t) * image->width * image->height;
+                image->pixels = malloc(size);
+                memset(image->pixels, packed, size);
+            }
+        }
+        else
+        {
+            int size = 4 * image->width * image->height;
+            image->pixels = malloc(size);
+            memset(image->pixels, 0, size);
+        }
+        RDATA(self)->data = image;
+        return Qnil;
+    }
+
+    rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 2, 3)", argc);
+}
+
+VALUE rb_glfw_image_width(VALUE self) {
+    GLFWimage *image;
+    Data_Get_Struct(self, GLFWimage, image);
+    return INT2NUM(image->width);
+}
+
+VALUE rb_glfw_image_height(VALUE self) {
+    GLFWimage *image;
+    Data_Get_Struct(self, GLFWimage, image);
+    return INT2NUM(image->height);
+}
+
+VALUE rb_glfw_image_pixels(VALUE self) {
+    GLFWimage *image;
+    Data_Get_Struct(self, GLFWimage, image);
+    int size = image->width * image->height * 4;
+    return rb_str_new(image->pixels, size);
 }