glfw3 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 197903711fa3522d32955dca8172d60d7f3b5a54
-  data.tar.gz: 6fa9a291165798a578aca51f943ccd467b3fb22b
+  metadata.gz: 8321b1d791bc79297ffc7ce8c4087290f2de35de
+  data.tar.gz: e70fed392fc347121443d92da642dde29714e521
 SHA512:
-  metadata.gz: 0f8165aa744318363832f74fde53762086ab1ba65c470ede8bfed41cac5bc14ce8b4464f503aafe05978bff2c615ce15cda576eb2793cdd2661fcc7eda26d729
-  data.tar.gz: 8e7134f82f4d78128b2b170e49daee6e2a323c7ae04677ae82eb1394a2382d2380f662ef38305a3c54bf620a629d46478566a6b55fcaa358ad766744a8344dbe
+  metadata.gz: a3af48ed74e81c3e577d2df3c719557b669825b8459c79acd36db0e8cd363ac3434693018f9d0db76cccff2cb2db92668d6dcc528e8a8a471b04b26380a23437
+  data.tar.gz: 70952724a68e2e1142d5fc89b41f8b54995365c5f5a0559a80027dfeee27158daa6db13c24829b2b5a7c2cdd7ac641b2568531282644867fe25d4342df8f6919

data/README.md

@@ -9,11 +9,15 @@ find it. You may also want to grab some [OpenGL bindings] as well.
 [OpenGL bindings]: https://github.com/nilium/ruby-opengl
 [GLFW 3]: https://github.com/glfw/glfw
 
-Once that's taken care of, you can install it simply by building and installing
-the gem, like so:
+Once that's taken care of, you can install it simply by installing the gem via RubyGems.org using
+
+    $ gem install glfw3
+
+Or by building and installing the gem, making note of the version so you know
+the gem package to install, like so:
 
     $ gem build glfw3.gemspec
-    $ gem install glfw3-0.0.1.gemspec
+    $ gem install glfw3-VERSION-HERE.gemspec
 
 After that, write a quick script to toy with it. For example:
 

data/ext/glfw3/glfw3.c

@@ -134,11 +134,15 @@ VALUE rb_glfw_get_monitors(VALUE self)
   long monitor_index = 0;
   int num_monitors = 0;
   GLFWmonitor **monitors = glfwGetMonitors(&num_monitors);
-  VALUE monitors_out = rb_ary_new();
-  for (; num_monitors; --num_monitors, ++monitor_index) {
-    VALUE monitor = Data_Wrap_Struct(s_glfw_monitor_klass, 0, 0, monitors[monitor_index]);
-    rb_obj_call_init(monitor, 0, 0);
-    rb_ary_push(monitors_out, monitor);
+  VALUE monitors_out = Qnil;
+
+  if (monitors) {
+    monitors_out = rb_ary_new();
+    for (; num_monitors; --num_monitors, ++monitor_index) {
+      VALUE monitor = Data_Wrap_Struct(s_glfw_monitor_klass, 0, 0, monitors[monitor_index]);
+      rb_obj_call_init(monitor, 0, 0);
+      rb_ary_push(monitors_out, monitor);
+    }
   }
   return monitors_out;
 }
@@ -155,9 +159,13 @@ VALUE rb_glfw_get_monitors(VALUE self)
  */
 VALUE rb_glfw_get_primary_monitor(VALUE self)
 {
-  VALUE monitor = Data_Wrap_Struct(s_glfw_monitor_klass, 0, 0, glfwGetPrimaryMonitor());
-  rb_obj_call_init(monitor, 0, 0);
-  return monitor;
+  GLFWmonitor *monitor = glfwGetPrimaryMonitor();
+  VALUE rb_monitor = Qnil;
+  if (monitor != NULL) {
+    rb_monitor = Data_Wrap_Struct(s_glfw_monitor_klass, 0, 0, monitor);
+    rb_obj_call_init(rb_monitor, 0, 0);
+  }
+  return rb_monitor;
 }
 
 
@@ -213,8 +221,10 @@ VALUE rb_monitor_physical_size(VALUE self)
 VALUE rb_monitor_name(VALUE self)
 {
   GLFWmonitor *monitor;
+  const char *monitor_name = NULL;
   Data_Get_Struct(self, GLFWmonitor, monitor);
-  return rb_str_new2(glfwGetMonitorName(monitor));
+  monitor_name = glfwGetMonitorName(monitor);
+  return monitor_name ? rb_str_new2(monitor_name) : Qnil;
 }
 
 
@@ -391,8 +401,114 @@ static VALUE rb_monitor_set_gamma(VALUE self, VALUE gamma)
 
 
 
-#warning "No implementation for glfwGetGammaRamp bindings"
-#warning "No implementation for glfwSetGammaRamp bindings"
+/*
+ * Gets the monitor's gamma ramp and returns it as a hash of its red, green, and
+ * blue gamma ramps. By default, this might be equal to
+ * `{ :red => [], :green => [], :blue => []}`. Ramp values are in the range of
+ * 0 through 65535, or the 0 through USHRT_MAX (in C).
+ *
+ * call-seq:
+ *    get_gamma_ramp -> { :red => [...], :green => [...], :blue => [...] } or nil
+ *    gamma_ramp = -> hash or nil
+ *
+ *  Wraps glfwGetGammaRamp.
+ */
+static VALUE rb_monitor_get_gamma_ramp(VALUE self)
+{
+  GLFWmonitor *monitor;
+  const GLFWgammaramp *ramp;
+  VALUE rb_gamma_hash, rb_red, rb_green, rb_blue;
+  unsigned int ramp_index;
+  unsigned int ramp_len = ramp->size;
+
+  Data_Get_Struct(self, GLFWmonitor, monitor);
+  ramp = glfwGetGammaRamp(monitor);
+
+  rb_gamma_hash  = rb_hash_new();
+  rb_red   = rb_ary_new();
+  rb_green = rb_ary_new();
+  rb_blue  = rb_ary_new();
+
+  for (ramp_index = 0; ramp_index < ramp_len; ++ramp_index) {
+    rb_ary_push(rb_red, INT2NUM(ramp->red[ramp_index]));
+    rb_ary_push(rb_green, INT2NUM(ramp->green[ramp_index]));
+    rb_ary_push(rb_blue, INT2NUM(ramp->blue[ramp_index]));
+  }
+
+  rb_hash_aset(rb_gamma_hash, ID2SYM(rb_intern("red")), rb_red);
+  rb_hash_aset(rb_gamma_hash, ID2SYM(rb_intern("green")), rb_green);
+  rb_hash_aset(rb_gamma_hash, ID2SYM(rb_intern("blue")), rb_blue);
+
+  return rb_gamma_hash;
+}
+
+
+
+/*
+ * Sets the monitor's gamma ramp with the ramps provided in the ramp hash. The
+ * ramp hash must have arrays for :red, :green, and :blue keys. The arrays
+ * should be the same length, otherwise the shortest array length will be used.
+ *
+ * Gamma ramps should be in the range of an usngiend short, so 0 through 65535
+ * or USHRT_MAX.
+ *
+ * For example, to set a linear gamma ramp that is half as intense as what is
+ * likely your default:
+ *
+ *      ramp = (0 ... 32768).step(128).to_a
+ *      monitor.set_gamma_ramp({ :red => ramp, :green => ramp, :blue => ramp })
+ *
+ * call-seq:
+ *     set_gamma_ramp(ramp) -> self
+ *     gamma_ramp = ramp -> self
+ *
+ *  Wraps glfwSetGammaRamp.
+ *
+ */
+static VALUE rb_monitor_set_gamma_ramp(VALUE self, VALUE ramp_hash)
+{
+  GLFWmonitor *monitor;
+  GLFWgammaramp ramp;
+  VALUE rb_red, rb_green, rb_blue;
+  unsigned int ramp_index;
+  unsigned int ramp_len = 0;
+
+  Data_Get_Struct(self, GLFWmonitor, monitor);
+
+  rb_red = rb_hash_aref(ramp_hash, ID2SYM(rb_intern("red")));
+  rb_green = rb_hash_aref(ramp_hash, ID2SYM(rb_intern("green")));
+  rb_blue = rb_hash_aref(ramp_hash, ID2SYM(rb_intern("blue")));
+
+  if (!(RTEST(rb_red) && RTEST(rb_green) && RTEST(rb_blue))) {
+    rb_raise(rb_eArgError, "Ramp Hash must contain :red, :green, and :blue arrays");
+  }
+
+  ramp_len = RARRAY_LEN(rb_red);
+  if ((ramp_index = (unsigned int)RARRAY_LEN(rb_green)) < ramp_len) {
+    ramp_len = ramp_index;
+  } else if ((ramp_index = (unsigned int)RARRAY_LEN(rb_blue)) < ramp_len) {
+    ramp_len = ramp_index;
+  }
+
+  unsigned short *ramp_buffer = ALLOC_N(unsigned short, 3 * ramp_len);
+  ramp.red = ramp_buffer;
+  ramp.green = &ramp_buffer[ramp_len];
+  ramp.blue = &ramp_buffer[ramp_len * 2];
+
+  for (ramp_index = 0; ramp_index < ramp_len; ++ramp_index) {
+    ramp.red[ramp_index] = rb_num2ushort(rb_ary_entry(rb_red, ramp_index));
+    ramp.green[ramp_index] = rb_num2ushort(rb_ary_entry(rb_green, ramp_index));
+    ramp.blue[ramp_index] = rb_num2ushort(rb_ary_entry(rb_blue, ramp_index));
+  }
+
+  ramp.size = ramp_len;
+
+  glfwSetGammaRamp(monitor, &ramp);
+
+  free(ramp_buffer);
+
+  return self;
+}
 
 
 
@@ -758,8 +874,12 @@ static VALUE rb_window_hide(VALUE self)
 static VALUE rb_window_get_monitor(VALUE self)
 {
   GLFWmonitor *monitor = glfwGetWindowMonitor(rb_get_window(self));
-  VALUE rb_monitor = Data_Wrap_Struct(s_glfw_monitor_klass, 0, 0, monitor);
-  rb_obj_call_init(rb_monitor, 0, 0);
+  VALUE rb_monitor = Qnil;
+  if (monitor != NULL) {
+    // windowed mode
+    Data_Wrap_Struct(s_glfw_monitor_klass, 0, 0, monitor);
+    rb_obj_call_init(rb_monitor, 0, 0);
+  }
   return rb_monitor;
 }
 
@@ -1339,6 +1459,8 @@ void Init_glfw3(void)
   rb_define_method(s_glfw_monitor_klass, "video_modes", rb_monitor_video_modes, 0);
   rb_define_method(s_glfw_monitor_klass, "video_mode", rb_monitor_video_mode, 0);
   rb_define_method(s_glfw_monitor_klass, "set_gamma", rb_monitor_set_gamma, 1);
+  rb_define_method(s_glfw_monitor_klass, "set_gamma_ramp", rb_monitor_set_gamma_ramp, 1);
+  rb_define_method(s_glfw_monitor_klass, "get_gamma_ramp", rb_monitor_get_gamma_ramp, 0);
 
   /* Glfw::VideoMode */
   rb_define_method(s_glfw_videomode_klass, "width", rb_videomode_width, 0);
@@ -1353,21 +1475,17 @@ void Init_glfw3(void)
   rb_define_singleton_method(s_glfw_window_klass, "window_hint", rb_window_window_hint, 2);
   rb_define_singleton_method(s_glfw_window_klass, "default_window_hints", rb_window_default_window_hints, 0);
   rb_define_singleton_method(s_glfw_window_klass, "unset_context", rb_window_unset_context, 0);
-  // rb_define_method(s_glfw_window_klass, "initialize", rb_window_init, -1);
   rb_define_method(s_glfw_window_klass, "destroy", rb_window_destroy, 0);
-  rb_define_method(s_glfw_window_klass, "should_close?", rb_window_should_close, 0);
-  rb_define_method(s_glfw_window_klass, "should_close=", rb_window_set_should_close, 1);
+  rb_define_method(s_glfw_window_klass, "get_should_close", rb_window_should_close, 0);
   rb_define_method(s_glfw_window_klass, "set_should_close", rb_window_set_should_close, 1);
   rb_define_method(s_glfw_window_klass, "current_context", rb_window_get_current_context, 0);
   rb_define_method(s_glfw_window_klass, "make_context_current", rb_window_make_context_current, 0);
   rb_define_method(s_glfw_window_klass, "swap_buffers", rb_window_swap_buffers, 0);
   rb_define_method(s_glfw_window_klass, "title=", rb_window_set_title, 1);
-  rb_define_method(s_glfw_window_klass, "position", rb_window_get_position, 0);
+  rb_define_method(s_glfw_window_klass, "get_position", rb_window_get_position, 0);
   rb_define_method(s_glfw_window_klass, "set_position", rb_window_set_position, 2);
-  rb_define_method(s_glfw_window_klass, "move", rb_window_set_position, 2);
-  rb_define_method(s_glfw_window_klass, "size", rb_window_get_size, 0);
+  rb_define_method(s_glfw_window_klass, "get_size", rb_window_get_size, 0);
   rb_define_method(s_glfw_window_klass, "set_size", rb_window_set_size, 2);
-  rb_define_method(s_glfw_window_klass, "resize", rb_window_set_size, 2);
   rb_define_method(s_glfw_window_klass, "framebuffer_size", rb_window_get_framebuffer_size, 0);
   rb_define_method(s_glfw_window_klass, "iconify", rb_window_iconify, 0);
   rb_define_method(s_glfw_window_klass, "restore", rb_window_restore, 0);
@@ -1385,7 +1503,7 @@ void Init_glfw3(void)
   rb_define_method(s_glfw_window_klass, "set_input_mode", rb_window_set_input_mode, 2);
   rb_define_method(s_glfw_window_klass, "key", rb_window_get_key, 1);
   rb_define_method(s_glfw_window_klass, "mouse_button", rb_window_get_mouse_button, 1);
-  rb_define_method(s_glfw_window_klass, "cursor_pos", rb_window_get_cursor_pos, 0);
+  rb_define_method(s_glfw_window_klass, "get_cursor_pos", rb_window_get_cursor_pos, 0);
   rb_define_method(s_glfw_window_klass, "set_cursor_pos", rb_window_set_cursor_pos, 2);
   rb_define_method(s_glfw_window_klass, "set_key_callback__", rb_window_set_key_callback, 1);
   rb_define_method(s_glfw_window_klass, "set_char_callback__", rb_window_set_char_callback, 1);

data/lib/glfw3.rb

@@ -1,5 +1,6 @@
 require 'glfw3/glfw3'
 require 'glfw3/callbacks'
+require 'glfw3/monitor'
 require 'glfw3/window'
 
 #

data/lib/glfw3/monitor.rb

@@ -0,0 +1,8 @@
+require 'glfw3/glfw3'
+
+module Glfw ; end
+
+class Glfw::Monitor
+  alias_method :gamma_ramp=, :set_gamma_ramp
+  alias_method :gamma_ramp, :get_gamma_ramp
+end

data/lib/glfw3/window.rb

@@ -33,14 +33,39 @@ class Glfw::Window
   #
   attr_accessor :user_data
 
+
+
+  alias_method :should_close?, :get_should_close
+  alias_method :should_close=, :set_should_close
+
+  alias_method :cursor_pos, :get_cursor_pos
+
+  def cursor_pos=(xy)
+    set_cursor_pos(*xy)
+  end
+
+  alias_method :move, :set_position
+  alias_method :resize, :set_size
+
+  alias_method :position, :get_position
+  alias_method :size, :get_size
+
+  def position=(xy)
+    set_position(*xy)
+  end
+
+  def size=(wh)
+    set_size(*wh)
+  end
+
   #
   # Returns an array of all allocated GLFW windows.
   #
   # call-seq:
   #     windows -> [Glfw::Window, ...]
   #
-  def windows
-    @__windows.values
+  def self.windows
+    @@__windows.values
   end
 
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glfw3
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Noel Raymond Cower
@@ -21,6 +21,7 @@ extra_rdoc_files:
 - COPYING
 files:
 - lib/glfw3/callbacks.rb
+- lib/glfw3/monitor.rb
 - lib/glfw3/window.rb
 - lib/glfw3.rb
 - ext/glfw3/glfw3.c