ray 0.1.1 → 0.2.0

data/samples/shaders/shape.rb

@@ -19,11 +19,11 @@ Ray::Game.new("Shaders test") do
     @shape.shader = Ray::Shader.new :frag => StringIO.new(<<-SHADER)
       #version 110
 
-      uniform vec3 ratio[2];
+      uniform vec3 ratio;
       varying vec4 var_Color;
 
       void main() {
-        float gray   = dot(var_Color.rgb, ratio[0]);
+        float gray   = dot(var_Color.rgb, ratio);
         gl_FragColor = vec4(gray, gray, gray, 1.0);
       }
     SHADER

data/samples/starfighter/starfighter.rb

@@ -7,7 +7,7 @@ require 'ray'
 require 'forwardable'
 
 def path_of(resource)
-  File.expand_path File.join(File.dirname(File.dirname(__FILE__)), resource)
+  File.join(File.dirname(__FILE__), "../../test/res", resource)
 end
 
 class Player
@@ -20,10 +20,10 @@ class Player
 
   def initialize(stars)
     @stars = stars
-    @sprite = Ray::Sprite.new path_of("_media/Starfighter.png")
+    @sprite = Ray::Sprite.new path_of("Starfighter.png")
     @sprite.origin = @sprite.image.size / 2
 
-    @beep = sound path_of("_media/Beep.wav")
+    @beep = sound path_of("Beep.wav")
 
     @vel_x = @vel_y = 0.0
 
@@ -89,7 +89,7 @@ class Star
   attr_reader :sprite
 
   def initialize(position)
-    @sprite = Ray::Sprite.new path_of("_media/Star.png"), :at => position
+    @sprite = Ray::Sprite.new path_of("Star.png"), :at => position
     @sprite.sheet_size = [10, 1]
     @sprite.origin = (@sprite.image.size / @sprite.sheet_size) / 2
     @animation = sprite_animation(:from => [0, 0], :to => [9, 0],
@@ -122,7 +122,7 @@ Ray::Game.new("Starfighter --- [LEFT/RIGHT/UP to move; collect the stars]") do
   end
 
   scene :game do
-    @background_image = sprite path_of("_media/Space.png")
+    @background_image = sprite path_of("Space.png")
     @score_text = text("", :at => [10, 10], :size => 20,
                        :color => Ray::Color.yellow)
 

data/samples/window/get_pixel.rb

@@ -14,7 +14,7 @@ Ray.game "Get Pixels" do
     end
 
     on :key_press, key(:p) do
-      window.to_image.write "screenshot.png"
+      window.to_image.write "screenshot.tga"
     end
 
     @obj = Ray::Polygon.circle([50, 50], 10, Ray::Color.blue)

data/test/animation_list_test.rb

@@ -40,8 +40,15 @@ context "an animation list" do
     context "after #update" do
       hookup { topic.update }
 
-      asserts :empty?
-      asserts(:to_a).equals []
+      denies :empty?
+      asserts(:to_a).equals { [@anim] }
+
+      context "and #remove_unused" do
+        hookup { topic.remove_unused }
+
+        asserts :empty?
+        asserts(:to_a).equals []
+      end
     end
   end
 
@@ -77,8 +84,15 @@ context "an animation list" do
     context "after #update" do
       hookup { topic.update }
 
-      asserts :empty?
-      asserts(:to_a).equals []
+      denies :empty?
+      asserts(:to_a).equals { [@anim] }
+
+      context "and #remove_unused" do
+        hookup { topic.remove_unused }
+
+        asserts :empty?
+        asserts(:to_a).equals []
+      end
     end
   end
 

data/test/drawable_test.rb

@@ -9,6 +9,14 @@ context "a drawable" do
   asserts(:z).equals 0
   asserts(:angle).equals 0
   asserts(:shader).nil
+  asserts(:shader_attributes).nil
+  asserts(:matrix_proc).nil
+  asserts(:blend_mode).equals :alpha
+
+  context "after changing blend mode" do
+    hookup { topic.blend_mode = :add }
+    asserts(:blend_mode).equals :add
+  end
 
   context "after changing origin" do
     hookup { topic.origin = Ray::Vector2[10, 20] }
@@ -61,12 +69,16 @@ context "a drawable" do
   end
 
   context "with several transformations" do
+    attr = {:foo => 3}
+
     hookup do
       topic.origin = [30, 40]
       topic.pos    = [10, 20]
       topic.angle  = 90
       topic.scale  = [2, 0.5]
       topic.z      = 9
+
+      topic.shader_attributes = attr
     end
 
     # (10, 30)   => (-20, -10) (origin)
@@ -88,6 +100,11 @@ context "a drawable" do
       asserts(:angle).equals 90
       asserts(:scale).equals Ray::Vector2[2, 0.5]
       asserts(:z).equals 9
+
+      asserts(:shader_attributes).equals attr
+      asserts("shader_attributes are copied") do
+        !(topic.shader_attributes.equal? attr)
+      end
     end
 
     context "and a custom matrix" do
@@ -107,6 +124,35 @@ context "a drawable" do
                                                     1e-6)
       end
     end
+
+    context "and a custom matrix proc" do
+      matrix_proc =  proc { Ray::Matrix.identity }
+
+      hookup do
+        proxy(matrix_proc).call
+
+        topic.matrix_proc = matrix_proc
+        topic.matrix # calls proc
+      end
+
+      asserts(:matrix).equals Ray::Matrix.new
+      asserts(:matrix_proc).equals matrix_proc
+      asserts(:matrix_proc).received(:call) { topic }
+
+      context "when matrix is accessed twice" do
+        hookup { topic.matrix }
+        denies(:matrix_proc).received(:call => 2) { topic }
+      end
+
+      context "when matrix is accessed after a change" do
+        hookup do
+          topic.matrix_changed!
+          topic.matrix
+        end
+
+        asserts(:matrix_proc).received(:call => 2) { topic }
+      end
+    end
   end
 
   context "after changing shader" do
@@ -194,15 +240,38 @@ context "a custom drawable" do
     end
   end
 
-  context "with indices" do
+  context "drawn with indices" do
     hookup do
       proxy(topic).fill_indices
+      proxy(topic).render
+
       topic.index_count = 3
 
       target.draw topic
     end
 
     asserts_topic.received :fill_indices, is_a(Integer)
+    asserts_topic.received :render, is_a(Integer), is_a(Integer)
+
+    context "but no vertices" do
+      hookup do
+        topic.vertex_count = 0
+        target.draw topic
+      end
+
+      asserts_topic.received({:render => 2}, is_a(Integer), is_a(Integer))
+    end
+  end
+
+  context "drawn without vertices" do
+    hookup do
+      topic.vertex_count = 0
+
+      proxy(topic).render
+      target.draw topic
+    end
+
+    asserts_topic.received :render, 0, 0
   end
 
   context "with more indices than it gives" do

data/test/effect_generator_test.rb

@@ -0,0 +1,63 @@
+require File.expand_path(File.dirname(__FILE__)) + '/helpers.rb'
+
+context "an effect generator" do
+  setup do
+    gen = Ray::Effect::Generator.new
+    gen << (@effect = Ray::Effect::Grayscale.new([3, 5, 2]))
+  end
+
+  asserts(:effects).equals { [@effect] }
+
+  asserts(:version).equals 110
+
+  asserts(:input).matches "vec4 var_Color"
+  asserts(:input).matches "vec2 var_TexCoord"
+  asserts(:input).matches "varying "
+  denies(:input).matches  "in "
+
+  asserts(:uniforms).matches "uniform sampler2D in_Texture"
+  asserts(:uniforms).matches "uniform bool in_TextureEnabled"
+
+  context "code" do
+    setup do
+      @struct = @effect.struct
+      @code   = @effect.code
+      stub(@effect).header { "HEADER" }
+      topic.code
+    end
+
+    asserts_topic.matches "gl_FragColor"
+    denies_topic.matches  "out_FragColor"
+
+    asserts_topic.matches "uniform ray_grayscale grayscale;"
+
+    asserts("headers are before structs") {
+      topic.index("HEADER") < topic.index(@struct)
+    }
+
+    asserts("structs are before functions") {
+      topic.index(@struct) < topic.index(@code)
+    }
+
+    asserts_topic.matches "if (grayscale.enabled)"
+  end
+
+  context "built shader" do
+    setup do
+      shader = Ray::Shader.new
+
+      proxy(shader).compile
+      proxy(shader).__send__(:[]=)
+
+      topic.build shader
+
+      shader
+    end
+
+    asserts_topic.received(:compile, is_a(Hash))
+    asserts_topic.received(:[]=, "grayscale.enabled", true)
+    asserts_topic.received(:[]=, "grayscale.ratio", [3, 5, 2])
+  end
+end
+
+run_tests if __FILE__ == $0

data/test/effect_test.rb

@@ -0,0 +1,61 @@
+require File.expand_path(File.dirname(__FILE__)) + '/helpers.rb'
+
+class SomeEffect < Ray::Effect
+  Code = %{
+    vec4 effect(ray_some_effect args, vec4 color) {
+      return color;
+    }
+  }
+
+  Header = %{
+    foo bar;
+  }
+
+  effect_name :some_effect
+  attribute   :thing, "vec4"
+  attribute   :array, "vec2[10]"
+
+  def code
+    Code
+  end
+
+  def header
+    Header
+  end
+
+  def defaults
+    {
+      :thing     => [4, 3, 2, 1],
+      "array[0]" => [10, 20]
+    }
+  end
+end
+
+context "an effect" do
+  setup { SomeEffect.new }
+
+  asserts(:name).equals :some_effect
+
+  asserts(:header).equals SomeEffect::Header
+
+  asserts(:struct).matches "struct ray_some_effect"
+  asserts(:struct).matches "bool enabled;"
+  asserts(:struct).matches "vec4 thing;"
+  asserts(:struct).matches "vec2 array[10];"
+
+  asserts(:code).equals SomeEffect::Code
+
+  context "default elements" do
+    setup do
+      hash = {}
+      topic.apply_defaults hash
+      hash
+    end
+
+    asserts_topic.equals("some_effect.enabled"  => true,
+                         "some_effect.thing"    => [4,   3, 2, 1],
+                         "some_effect.array[0]" => [10, 20])
+  end
+end
+
+run_tests if __FILE__ == $0

data/test/game_test.rb

@@ -60,6 +60,24 @@ context "a game" do
     end
   end
 
+  context "with several scenes" do
+    hookup { topic.scenes << :scene_0 << :scene_1 << :scene_2 }
+
+    asserts :running?
+    asserts("current_scene") { topic.scenes.current }.equals {
+      topic.registered_scene(:scene_2)
+    }
+
+    context "after removing a few scenes" do
+      hookup { topic.pop_scene_while { |scene| scene.name != :scene_0 } }
+
+      asserts :running?
+      asserts("current_scene") { topic.scenes.current }.equals {
+        topic.registered_scene(:scene_0)
+      }
+    end
+  end
+
   context "after changing event_runner" do
     hookup do
       topic.event_runner = @runner = Ray::DSL::EventRunner.new

data/test/gl_buffer_test.rb

@@ -1,6 +1,9 @@
 require File.expand_path("helpers.rb", File.dirname(__FILE__))
 
-MagicVertex = Ray::GL::Vertex.make [[:foo, "bar", :float]]
+MagicVertex = Ray::GL::Vertex.make [
+  [:vertex,   "bar", :float],
+  [:instance, "baz", :float, true],
+]
 
 context "a buffer" do
   setup { Ray::GL::Buffer.new :static, Ray::Vertex }
@@ -11,8 +14,16 @@ context "a buffer" do
   asserts(:[], 256).nil
   asserts(:[]=, 257, Ray::Vertex.new).raises_kind_of RangeError
 
+  denies :has_instance?
+  asserts(:instance_size).nil
+  asserts(:resize_instance, 300).raises_kind_of RuntimeError
+  asserts(:get_instance, 0).raises_kind_of RuntimeError
+  asserts(:set_instance, 0, MagicVertex::Instance.new).
+    raises_kind_of RuntimeError
+
   context "nth vertex after setting it" do
     setup do
+      @buf = topic
       topic[34] = Ray::Vertex.new([10, 20], Ray::Color.red, [30, 40])
       topic[34]
     end
@@ -20,6 +31,37 @@ context "a buffer" do
     asserts(:pos).equals Ray::Vector2[10, 20]
     asserts(:col).equals Ray::Color.red
     asserts(:tex).equals Ray::Vector2[30, 40]
+
+    context "and resizing the buffer" do
+      setup do
+        @buf.resize 300
+        @buf[34]
+      end
+
+      asserts(:pos).equals Ray::Vector2[10, 20]
+      asserts(:col).equals Ray::Color.red
+      asserts(:tex).equals Ray::Vector2[30, 40]
+    end
+  end
+end
+
+context "a buffer with per-instance data" do
+  setup { Ray::GL::Buffer.new :static, MagicVertex }
+
+  asserts :has_instance?
+  asserts(:instance_size).equals 0
+  asserts(:get_instance, 0).nil
+  asserts(:set_instance, 0, MagicVertex::Instance.new).
+    raises_kind_of RangeError
+
+  context "resized" do
+    hookup { topic.resize_instance 300 }
+    asserts(:instance_size).equals 300
+
+    context "nth instance" do
+      setup { topic.set_instance 10, MagicVertex::Instance.new(42) }
+      asserts(:instance).equals 42
+    end
   end
 end
 

data/test/gl_index_buffer_test.rb

@@ -11,6 +11,11 @@ context "an index buffer" do
   context "after changing an element" do
     hookup { topic[34] = 30 }
     asserts(:[], 34).equals 30
+
+    context "and resizing the buffer" do
+      hookup { topic.resize 300 }
+      asserts(:[], 34).equals 30
+    end
   end
 end
 

data/test/gl_vertex_test.rb

@@ -7,7 +7,10 @@ TestVertex = Ray::GL::Vertex.make [
   [:bool,    "in_Bool",     :bool],
   [:color,   "in_Color",    :color],
   [:vector2, "in_Vector2",  :vector2],
-  [:vector3, "in_Vector3",  :vector3]
+  [:vector3, "in_Vector3",  :vector3],
+
+  [:magic, "in_Magic", :vector3, true],
+  [:foo,   "in_Foo",   :bool,    true],
 ]
 
 context "a custom vertex" do
@@ -114,4 +117,28 @@ context "a custom vertex" do
   end
 end
 
+context "an instance block" do
+  setup { TestVertex::Instance.new([1, 2, 3]) }
+
+  asserts(:magic).equals Ray::Vector3[1, 2, 3]
+  asserts(:foo)
+  asserts(:foo?)
+
+  context "after changing magic" do
+    hookup { topic.magic = [3, 2, 1] }
+
+    asserts(:magic).equals Ray::Vector3[3, 2, 1]
+    asserts(:foo)
+    asserts(:foo?)
+  end
+
+  context "after changing foo" do
+    hookup { topic.foo = false }
+
+    asserts(:magic).equals Ray::Vector3[1, 2, 3]
+    denies(:foo)
+    denies(:foo?)
+  end
+end
+
 run_tests if __FILE__ == $0