ray 0.2.0 → 0.2.1

data/ext/say_matrix.c

@@ -312,3 +312,35 @@ void say_matrix_look_at(say_matrix *matrix,
 
   say_matrix_free(other);
 }
+
+void say_matrix_set_transformation(say_matrix *matrix,
+                                   say_vector2 origin,
+                                   say_vector2 pos, float z,
+                                   say_vector2 scale,
+                                   float angle) {
+  angle = -angle * SAY_PI / 180;
+
+  float c = cosf(angle);
+  float s = sinf(angle);
+
+  float sx_cos = scale.x * c;
+  float sy_cos = scale.y * c;
+  float sx_sin = scale.x * s;
+  float sy_sin = scale.y * s;
+
+  float o_x = -origin.x * sx_cos - origin.y * sy_sin;
+  float o_y = +origin.x * sx_sin - origin.y * sy_cos;
+
+  float t_x = o_x + pos.x;
+  float t_y = o_y + pos.y;
+  float t_z = z;
+
+  float content[16] = {
+    +sx_cos, +sy_sin, 0, t_x,
+    -sx_sin, +sy_cos, 0, t_y,
+    0,       0, 1, t_z,
+    0,       0, 0,   1
+  };
+
+  say_matrix_set_content(matrix, content);
+}

data/ext/say_matrix.h

@@ -52,4 +52,10 @@ void say_matrix_look_at(say_matrix *matrix,
                         float center_x, float center_y, float center_z,
                         float up_x, float up_y, float up_z);
 
+void say_matrix_set_transformation(say_matrix *matrix,
+                                   say_vector2 origin,
+                                   say_vector2 pos, float z,
+                                   say_vector2 scale,
+                                   float angle);
+
 #endif

data/ext/say_music.c

@@ -79,11 +79,13 @@ static void *say_music_playback_thread(say_music *music) {
       }
     }
 
-    /* sleep for 0.25s */
+    /* sleep for 0.1s */
+    static const int sleep_time = 100;
+
 #ifdef SAY_WIN
-    Sleep(250);
+    Sleep(sleep_time);
 #else
-    usleep(250 * 1000);
+    usleep(sleep_time * 1000);
 #endif
   }
 

data/ext/say_pixel_bus.c

@@ -1,36 +1,31 @@
 #include "say.h"
 
-static say_context *say_pack_pbo_last_context = NULL;
-static GLuint       say_pack_pbo              = 0;
-
 static void say_pack_pbo_make_current(GLuint pbo) {
   say_context *context = say_context_current();
-  if (say_pack_pbo_last_context != context ||
-      pbo != say_pack_pbo) {
-    say_pack_pbo              = pbo;
-    say_pack_pbo_last_context = context;
 
+  if (context->pack_pbo != pbo) {
     glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo);
+    context->pack_pbo = pbo;
   }
 }
 
-static say_context *say_unpack_pbo_last_context = NULL;
-static GLuint       say_unpack_pbo              = 0;
-
 static void say_unpack_pbo_make_current(GLuint pbo) {
   say_context *context = say_context_current();
-  if (say_unpack_pbo_last_context != context ||
-      pbo != say_unpack_pbo) {
-    say_unpack_pbo              = pbo;
-    say_unpack_pbo_last_context = context;
 
+  if (context->unpack_pbo != pbo) {
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo);
+    context->unpack_pbo = pbo;
   }
 }
 
 static void say_pbo_will_delete(GLuint pbo) {
-  if (say_pack_pbo   == pbo) say_pack_pbo   = 0;
-  if (say_unpack_pbo == pbo) say_unpack_pbo = 0;
+  mo_array *contexts = say_context_get_all();
+  for (size_t i = 0; i < contexts->size; i++) {
+    say_context *context = mo_array_get_as(contexts, i, say_context*);
+
+    if (context->pack_pbo   == pbo) context->pack_pbo   = 0;
+    if (context->unpack_pbo == pbo) context->unpack_pbo = 0;
+  }
 }
 
 bool say_pixel_bus_is_available() {
@@ -134,7 +129,9 @@ void say_pixel_bus_resize(say_pixel_bus *bus, size_t new_size) {
   say_pixel_bus_bind_pack(bus);
 
   void *buffer = malloc(sizeof(say_color) * new_size);
-  glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, new_size, buffer);
+  size_t copied_size = new_size > bus->size ? bus->size : new_size;
+  glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, copied_size * sizeof(say_color),
+                     buffer);
 
   glBufferData(GL_PIXEL_PACK_BUFFER, new_size * sizeof(say_color),
                buffer, bus->mode);

data/ext/say_shader.c

@@ -1,17 +1,20 @@
 #include "say.h"
 
-static GLuint say_current_program = 0;
-static say_context *say_shader_last_context = NULL;
-
 static void say_shader_make_current(GLuint program) {
   say_context *context = say_context_current();
 
-  if (context != say_shader_last_context ||
-      program != say_current_program) {
-    say_current_program     = program;
-    say_shader_last_context = context;
-
+  if (context->program != program) {
     glUseProgram(program);
+    context->program = program;
+  }
+}
+
+static void say_shader_will_delete(GLuint program) {
+  mo_array *contexts = say_context_get_all();
+  for (size_t i = 0; i < contexts->size; i++) {
+    say_context *context = mo_array_get_as(contexts, i, say_context*);
+    if (context->program == program)
+      context->program = 0;
   }
 }
 
@@ -52,22 +55,6 @@ static void say_shader_find_locations(say_shader *shader) {
     glGetUniformLocation(shader->program, SAY_TEXTURE_ENABLED_ATTR);
 }
 
-static const char *say_default_frag_shader =
-  "#version 110\n"
-  "\n"
-  "uniform sampler2D in_Texture;\n"
-  "uniform bool in_TextureEnabled;\n"
-  "\n"
-  "varying vec4 var_Color;\n"
-  "varying vec2 var_TexCoord;\n"
-  "\n"
-  "void main() {\n"
-  "  if (in_TextureEnabled)\n"
-  "    gl_FragColor = texture2D(in_Texture, var_TexCoord) * var_Color;\n"
-  "  else\n"
-  "    gl_FragColor = var_Color;\n"
-  "}\n";
-
 static const char *say_default_vertex_shader =
   "#version 110\n"
   "\n"
@@ -87,22 +74,20 @@ static const char *say_default_vertex_shader =
   "  var_TexCoord = in_TexCoord;\n"
   "}\n";
 
-static const char *say_new_default_frag_shader =
-  "#version 130\n"
+static const char *say_default_frag_shader =
+  "#version 110\n"
   "\n"
   "uniform sampler2D in_Texture;\n"
   "uniform bool in_TextureEnabled;\n"
   "\n"
-  "in vec4 var_Color;\n"
-  "in vec2 var_TexCoord;\n"
-  "\n"
-  "out vec4 out_FragColor;\n"
+  "varying vec4 var_Color;\n"
+  "varying vec2 var_TexCoord;\n"
   "\n"
   "void main() {\n"
   "  if (in_TextureEnabled)\n"
-  "    out_FragColor = texture(in_Texture, var_TexCoord) * var_Color;\n"
+  "    gl_FragColor = texture2D(in_Texture, var_TexCoord) * var_Color;\n"
   "  else\n"
-  "    out_FragColor = var_Color;\n"
+  "    gl_FragColor = var_Color;\n"
   "}\n";
 
 static const char *say_new_default_vertex_shader =
@@ -124,6 +109,24 @@ static const char *say_new_default_vertex_shader =
   "  var_TexCoord = in_TexCoord;\n"
   "}\n";
 
+static const char *say_new_default_frag_shader =
+  "#version 130\n"
+  "\n"
+  "uniform sampler2D in_Texture;\n"
+  "uniform bool in_TextureEnabled;\n"
+  "\n"
+  "in vec4 var_Color;\n"
+  "in vec2 var_TexCoord;\n"
+  "\n"
+  "out vec4 out_FragColor;\n"
+  "\n"
+  "void main() {\n"
+  "  if (in_TextureEnabled)\n"
+  "    out_FragColor = texture(in_Texture, var_TexCoord) * var_Color;\n"
+  "  else\n"
+  "    out_FragColor = var_Color;\n"
+  "}\n";
+
 static uint8_t say_shader_use_new       = 0;
 static uint8_t say_shader_use_old_force = 0;
 
@@ -198,6 +201,7 @@ void say_shader_free(say_shader *shader) {
 
   say_shader_detach_geometry(shader);
 
+  say_shader_will_delete(shader->program);
   glDeleteProgram(shader->program);
 
   free(shader);

data/ext/say_target.c

@@ -1,8 +1,5 @@
 #include "say.h"
 
-static say_target *say_current_target = NULL;
-static say_context *say_target_last_context = NULL;
-
 static void say_target_update_states(say_target *target) {
   if (target->up_to_date) {
     target->up_to_date = 0;
@@ -106,9 +103,8 @@ int say_target_make_current(say_target *target) {
   if (context) {
     say_context *current = say_context_current();
 
-    if (current == say_target_last_context &&
-        target  == say_current_target &&
-        current == context) {
+    if (current == context &&
+        current->target == target) {
       return 1;
     }
 
@@ -118,8 +114,7 @@ int say_target_make_current(say_target *target) {
     if (target->bind_hook)
       target->bind_hook(target->data);
 
-    say_current_target      = target;
-    say_target_last_context = context;
+    current->target = target;
 
     return 1;
   }

data/ext/say_x11_window.h

@@ -7,13 +7,15 @@ unsigned long  say_x11_event_mask =
   LeaveWindowMask;
 
 static void say_x11_window_find_config(say_x11_window *win) {
-  static int visual_attribs[] = {
-    GLX_DOUBLEBUFFER, GL_TRUE,
-    GLX_RED_SIZE,   8,
-    GLX_GREEN_SIZE, 8,
-    GLX_BLUE_SIZE,  8,
-    GLX_ALPHA_SIZE, 8,
-    GLX_DEPTH_SIZE, 24,
+  say_context_config *say_conf = say_context_get_config();
+  int visual_attribs[] = {
+    GLX_RED_SIZE,     8,
+    GLX_GREEN_SIZE,   8,
+    GLX_BLUE_SIZE,    8,
+    GLX_ALPHA_SIZE,   8,
+    GLX_DEPTH_SIZE,   say_conf->depth_size,
+    GLX_STENCIL_SIZE, say_conf->stencil_size,
+    GLX_DOUBLEBUFFER, True,
     None
   };
 

data/ext/sprite.c

@@ -20,6 +20,7 @@ VALUE ray_sprite_alloc(VALUE self) {
 
   say_drawable_set_shader_proc(sprite->drawable, ray_drawable_shader_proc);
   say_drawable_set_other_data(sprite->drawable, (void*)rb);
+  rb_iv_set(rb, "@shader_attributes", Qnil);
 
   return rb;
 }

data/ext/text.c

@@ -21,6 +21,8 @@ VALUE ray_text_alloc(VALUE self) {
 
   say_drawable_set_shader_proc(text->drawable, ray_drawable_shader_proc);
   say_drawable_set_other_data(text->drawable, (void*)rb);
+  rb_iv_set(rb, "@shader_attributes", Qnil);
+  rb_iv_set(rb, "@font", Qnil);
 
   return rb;
 }

data/lib/ray/matrix.rb

@@ -37,17 +37,23 @@ module Ray
         new.look_at(eye, center, up)
       end
 
-      # @param [Array<Float>] args (see #orthogonal)
+      # @param (see #orthogonal)
       # @return [Ray::Matrix] An orthogonal projection matrix
       def orthogonal(*args)
         new.orthogonal(*args)
       end
 
-      # @param [Array<Float>] args (see #perspective)
+      # @param (see #perspective)
       # @return [Ray::Matrix] A perspective projection matrix
       def perspective(*args)
         new.perspective(*args)
       end
+
+      # @param (see #set_transformation)
+      # @return [Ray::Matrix] A 2D transformation matrix
+      def transformation(*args)
+        new.set_transformation(*args)
+      end
     end
 
     # @param [Array<Float>, nil] content Either nothing or the content of each

data/lib/ray/ray.rb

@@ -1,5 +1,5 @@
 require 'enumerator'
-require 'iconv'
+require 'iconv' if RUBY_VERSION < "1.9"
 
 # Change PATH so as to find DLLs on windows.
 if RUBY_PLATFORM =~ /mingw/

data/lib/ray/scene.rb

@@ -103,10 +103,9 @@ module Ray
       @scene_always_block     = nil
       @scene_render_block     = nil
       @scene_clean_block      = nil
-
       @scene_loops_per_second = 60
-
       @scene_animations       = Ray::AnimationList.new
+      @scene_arguments        = []
     end
 
     def register_events

data/samples/turtle/byzantium.rb

@@ -14,7 +14,7 @@ class Ray::Turtle
 
     4.times do
       pen_down
-      forward 2 * r * sin(PI / 4)
+      forward 2 * r * sin(Math::PI / 4)
 
       pen_up
       byzantium(r / 2, n - 1)

data/samples/turtle/mandala.rb

@@ -18,7 +18,7 @@ Ray::Game.new("Turtle") do
         center = target.clip.center
 
         poly = []
-        theta = 360 * (PI / 180) / n
+        theta = 360 * (Math::PI / 180) / n
 
         n.times do |k|
           angle = k * theta

data/test/drawable_test.rb

@@ -71,6 +71,12 @@ context "a drawable" do
   context "with several transformations" do
     attr = {:foo => 3}
 
+    transformation_matrix = Ray::Matrix.transformation([30, 40],
+                                                       [10, 20],
+                                                       9,
+                                                       [2, 0.5],
+                                                       90)
+
     hookup do
       topic.origin = [30, 40]
       topic.pos    = [10, 20]
@@ -81,6 +87,9 @@ context "a drawable" do
       topic.shader_attributes = attr
     end
 
+    asserts(:default_matrix).equals transformation_matrix
+    asserts(:matrix).equals transformation_matrix
+
     # (10, 30)   => (-20, -10) (origin)
     # (-20, -10) => (-40, -5)  (scale)
     # (-40, -5)  => (5, -40)   (rotate)
@@ -113,6 +122,8 @@ context "a drawable" do
       end
 
       asserts(:matrix).equals Ray::Matrix.new
+      asserts(:default_matrix).equals transformation_matrix
+
       asserts(:transform, [10, 30]).equals Ray::Vector3[10, 30, 0]
 
       context "that has been disabled" do
@@ -136,6 +147,7 @@ context "a drawable" do
       end
 
       asserts(:matrix).equals Ray::Matrix.new
+      asserts(:default_matrix).equals transformation_matrix
       asserts(:matrix_proc).equals matrix_proc
       asserts(:matrix_proc).received(:call) { topic }
 

data/test/helpers.rb

@@ -27,12 +27,15 @@ class AlmostEqualMacro < Riot::AssertionMacro
   register :almost_equals
 
   def test(actual, expected, epsilon)
-    diff = (actual - expected)
-    case diff
+    case actual
     when Numeric
-      diff.abs <= epsilon
+      (actual - expected).abs <= epsilon
     when Ray::Vector2, Ray::Vector3
-      diff.to_a.all? { |n| n.abs <= epsilon }
+      (actual - expected).to_a.all? { |n| n.abs <= epsilon }
+    when Ray::Matrix
+      actual.content.zip(expected.content).all? do |a, b|
+        (a - b).abs <= epsilon
+      end
     end
   end
 

data/test/image_test.rb

@@ -25,6 +25,10 @@ context "an image loaded from a file" do
   asserts(:[]=, 128, 100, Ray::Color.green).raises_kind_of RangeError
   asserts(:[]=, 100, 192, Ray::Color.green).raises_kind_of RangeError
 
+  asserts(:bind_to, -1).raises_kind_of RangeError
+  asserts(:bind_to, 32).raises_kind_of RangeError
+  denies(:bind_to, 31).raises_kind_of RangeError
+
   context "after changing a pixel" do
     hookup { topic[0, 10] = Ray::Color.green }
     asserts(:[], 0, 10).equals Ray::Color.green