ray 0.1.1 → 0.2.0

data/lib/ray/sound.rb

@@ -10,6 +10,10 @@ module Ray
       end
     end
 
+    def pretty_print(q)
+      super q, ["time", "duration", "looping?", "buffer"]
+    end
+
     alias time= seek
 
     alias position  pos

data/lib/ray/sprite.rb

@@ -44,74 +44,20 @@ module Ray
       # @sprite_sheet_pos  = Ray::Vector2[0, 0]
     end
 
-    # # Sets the size of the sprite sheet. For instance,
-    # #   sprite.sheet_size = [3, 4]
-    # # would mean there are 4 rows and 3 columns in the sprite (and each cell
-    # # has the same size).
-    # def sheet_size=(ary)
-    #   @uses_sprite_sheet = true
-    #   @sprite_sheet_size = ary.to_vector2
-
-    #   self.sheet_pos = [0, 0]
-    # end
-
-    # # Sets which cell of the sprite sheet should be displayed.
-    # #   sprite.sheet_pos = [0, 1] # Uses the first cell of the second line.
-    # #
-    # # pos.x and pos.y are rounded to floor.
-    # # Passing a too high value will make the sprite use the previous cells.
-    # #    sprite.sheet_size = [4, 4]
-    # #    sprite.sheet_size = [5, 5]
-    # #    sprite.sheet_size == [1, 1] # => true
-    # def sheet_pos=(pos)
-    #   pos = pos.to_vector2.dup
-    #   pos.x = pos.x.floor % @sprite_sheet_size.w
-    #   pos.y = pos.y.floor % @sprite_sheet_size.h
-
-    #   self.sub_rect = Ray::Rect.new(pos.x * sprite_width,
-    #                                 pos.y * sprite_height,
-    #                                 sprite_width, sprite_height)
-
-    #   @sheet_pos = pos
-    # end
-
-    # # @return [Ray::Vector2] the position of the cell which is being used.
-    # attr_reader :sheet_pos
-
-    # # @return [Integer, nil] The width of each cell in the sprite sheet
-    # def sprite_width
-    #   if uses_sprite_sheet?
-    #     image.w / @sprite_sheet_size.w
-    #   end
-    # end
-
-    # # @return [Integer, nil] The height of each cell in the sprite sheet
-    # def sprite_height
-    #   if uses_sprite_sheet?
-    #     image.h / @sprite_sheet_size.h
-    #   end
-    # end
-
-    # # Disables the sprite sheet
-    # def disable_sprite_sheet
-    #   self.sub_rect = Ray::Rect.new(0, 0, image.w, image.h) if image
-
-    #   @sprite_sheet_size = nil
-    #   @uses_sprite_sheet = false
-    # end
-
-    # def uses_sprite_sheet?
-    #   @uses_sprite_sheet
-    # end
-
     # @return [Ray::Rect] The rect where this sprite will be drawn, taking
     #   position and scale in account.
     def rect
       pos      = self.pos
       sub_rect = self.sub_rect
-      scade    = self.scale
+      origin   = self.origin
+      scale    = self.scale
+
+      top_left = (-origin * scale) + pos
 
-      Ray::Rect.new(pos.x, pos.y, sub_rect.w * scale.w, sub_rect.h * scale.h)
+      Ray::Rect.new(top_left.x,
+                    top_left.y,
+                    sub_rect.w * scale.w,
+                    sub_rect.h * scale.h)
     end
 
     # @param [Ray::Rect, #to_rect] An object with which the receiver may collide
@@ -132,5 +78,20 @@ module Ray
     def to_rect
       rect
     end
+
+    def pretty_print(q, other_attr = [])
+      attr = [
+              "image",
+              "color",
+              "x_flipped?", "y_flipped?",
+              "sub_rect", "rect"
+             ]
+
+      if uses_sprite_sheet?
+        attr.concat ["sheet_size", "sheet_pos", "sprite_width", "sprite_height"]
+      end
+
+      super q, attr + other_attr
+    end
   end
 end

data/lib/ray/target.rb

@@ -1,12 +1,31 @@
 module Ray
   class Target
+    include Ray::PP
+
+    # Shader used when drawing on this target
+    #
+    # Notice this method will always return the same object, and that modifying
+    # this object will modify the shader used internally be the target.
+    #
     # @return [Ray::Shader] Shader used when drawing on this target
     def shader
       @shader ||= simple_shader # must always remain the same object
     end
 
+    # @group Manipulating views
+
+    # Changes the view temporarily
+    #
     # @param [Ray::View] view A new view
     # @yield a block where the view has been changed
+    #
+    # @example
+    #   old_view = target.view
+    #   target.with_view new_view do
+    #     target.view == new_view # => true
+    #   end
+    #
+    #   target.view == old_view # => true
     def with_view(view)
       old_view = self.view
       self.view = view
@@ -14,5 +33,11 @@ module Ray
     ensure
       self.view = old_view
     end
+
+    # @endgroup
+
+    def pretty_print(q, other_attr = [])
+      pretty_print_attributes q, ["view", "shader", "size"] + other_attr
+    end
   end
 end

data/lib/ray/text.rb

@@ -97,6 +97,16 @@ module Ray
 
     alias :to_s :string
 
+    def pretty_print(q, other_attributes = [])
+      attr = [
+              "string",
+              "font", "color", "size", "style",
+              "rect", "auto_center"
+             ]
+
+      super q, (attr + other_attributes)
+    end
+
     private
     def parse_style(style)
       case style

data/lib/ray/turtle.rb

@@ -210,9 +210,15 @@ module Ray
   end
 
   class Target
-    # Creates a turtle operating on the receiver.
-    # Instance evaluates the block it is given if any.
-    # @return [Ray::Turtle] The turtle it created.
+    # Creates a turtle operating on the receiver
+    #
+    # If a block is passed, it is instance-evaluated (self becoming the turtle)
+    # and the receiver gets updated automatically.
+    #
+    # @yield Optionally perform drawing in the block
+    #
+    # @return [Ray::Turtle] The turtle it created
+    # @see Ray::Turtle
     def turtle(&block)
       turtle = Ray::Turtle.new(self)
       if block

data/lib/ray/vector.rb

@@ -141,6 +141,14 @@ module Ray
       "(%g, %g)" % [x, y]
     end
 
+    def pretty_print(q)
+      q.text "("
+      q.pp(("%g" % x).to_f) # hides simple-precision inacurracy
+      q.text ", "
+      q.pp(("%g" % y).to_f)
+      q.text ")"
+    end
+
     alias :w :x
     alias :h :y
 
@@ -278,6 +286,16 @@ module Ray
       "(%g, %g, %g)" % [x, y, z]
     end
 
+    def pretty_print(q)
+      q.text "("
+      q.pp(("%g" % x).to_f) # hides simple-precision inacurracy
+      q.text ", "
+      q.pp(("%g" % y).to_f)
+      q.text ", "
+      q.pp(("%g" % z).to_f)
+      q.text ")"
+    end
+
     def to_a
       [x, y, z]
     end

data/lib/ray/vertex.rb

@@ -3,6 +3,8 @@ module Ray
     # Important settings
     @vertex_type_id = 0
 
+    include Ray::PP
+
     def x; pos.x; end
     def y; pos.y; end
 
@@ -15,6 +17,10 @@ module Ray
     def tex_x=(val); self.tex = [val, tex_y]; end
     def tex_y=(val); self.tex = [tex_x, val]; end
 
+    def pretty_print(q)
+      pretty_print_attributes q, ["pos", "col", "tex"]
+    end
+
     alias color  col
     alias color= col=
 

data/lib/ray/view.rb

@@ -1,5 +1,23 @@
 module Ray
   class View
+    include Ray::PP
+
+    # @param [Ray::Rect] rect Rect to show, in pixels.
+    # @param [Ray::Vector2] target_size Size of the complete target, in pixels.
+    #
+    # @return [Ray::View] A view that allows to clip rendering to a given region
+    #   of the target, without scaling.
+    def self.clip(rect, target_size)
+      rect, target_size = rect.to_rect, target_size.to_vector2
+
+      viewport = Ray::Rect[rect.x / target_size.w,
+                           rect.y / target_size.h,
+                           rect.w / target_size.w,
+                           rect.h / target_size.y]
+
+     Ray::View.new(rect.center, rect.size, viewport)
+    end
+
     def ==(other)
       other.is_a?(Ray::View) && self.matrix == other.matrix
     end
@@ -43,5 +61,9 @@ module Ray
     def inspect
       "#<#{self.class} center=#{center} size=#{size} viewport=#{viewport}>"
     end
+
+    def pretty_print(q)
+      pretty_print_attributes q, ["center", "size", "matrix", "viewport"]
+    end
   end
 end

data/samples/animation/sprite_motion.rb

@@ -7,66 +7,6 @@ def path_of(res)
   File.expand_path File.join(File.dirname(__FILE__), '../../test/res', res)
 end
 
-class SpriteAnimation < Ray::Animation
-  register_for :sprite_animation
-
-  # @option opts [Ray::Vector2] :from First sprite position
-  # @option opts [Ray::Vector2] :to   Last sprite position
-  # @option opts [true, false]  :loop Whether to reset to the first step at the
-  #   end of the animation.
-  # @option opts [Float] :duration Duration of the animation, in seconds.
-  def setup(opts)
-    self.duration = opts[:duration]
-
-    @initial_value = opts[:from].to_vector2.dup
-
-    delta = opts[:to].to_vector2 - opts[:from].to_vector2
-
-    @x_steps = delta.x.to_i.abs + 1
-    @y_steps = delta.y.to_i.abs + 1
-
-    @negative_x = delta.x < 0
-    @negative_y = delta.y < 0
-
-    @loop = opts[:loop]
-  end
-
-  def update_target
-    progress = progression
-
-    x_prog = ((progress / 100) * @x_steps).floor
-    y_prog = ((progress / 100) * @y_steps).floor
-
-    x_prog = @x_steps - 1 if x_prog == @x_steps
-    y_prog = @y_steps - 1 if y_prog == @y_steps
-
-    target.sheet_pos = @initial_value + variation(x_prog, y_prog)
-  end
-
-  def end_animation
-    target.sheet_pos = @initial_value if @loop
-  end
-
-  def variation(x, y)
-    Ray::Vector2[@negative_x ? -x : x, @negative_y ? -y : y]
-  end
-
-  def -@
-    last_value = @initial_value + variation(@x_steps - 1, @y_steps - 1)
-
-    sprite_animation(:from     => @initial_value,
-                     :to       => last_value,
-                     :loop     => @loop,
-                     :duration => @duration)
-  end
-
-  attr_reader :current_value
-
-  attr_reader :initial_value
-  attr_reader :x_steps, :y_steps
-  attr_reader :negative_x, :negative_y
-end
-
 Ray.game "Sprite motion" do
   register { add_hook :quit, method(:exit!) }
 

data/samples/audio/{spacial.rb → spatial.rb}

@@ -9,7 +9,7 @@ require 'ray'
 
 SPEED = 5
 
-Ray.game "Spacial sounds" do
+Ray.game "Spatialization" do
   register do
     add_hook :quit, method(:exit!)
   end

data/samples/buffer/buffer.rb

@@ -20,6 +20,7 @@ Ray.game "My Own Buffer" do
 
     render do |win|
       win.make_current
+      @buffer.bind
       Ray::GL.draw_arrays :triangles, 0, 3
     end
   end

data/samples/buffer/index_buffer.rb

@@ -28,6 +28,8 @@ Ray.game "My Own Index Buffer" do
 
     render do |win|
       win.make_current
+      @buffer.bind
+      @index_buffer.bind
       Ray::GL.draw_elements :triangles, 3, 0
     end
   end

data/samples/cptn_ruby/cptn_ruby.rb

@@ -30,10 +30,9 @@ $:.unshift File.expand_path(File.dirname(__FILE__) + "/../../ext")
 require 'ray'
 
 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 CptnRuby
   include Ray::Helper
 
@@ -51,7 +50,7 @@ class CptnRuby
     @map = map
     @vy  = 0
 
-    @sprite = Ray::Sprite.new path_of("_media/CptnRuby.png"), :at => pos
+    @sprite = Ray::Sprite.new path_of("CptnRuby.png"), :at => pos
     @sprite.sheet_size = [4, 1]
 
     @size = Ray::Vector2[@sprite.sprite_width, @sprite.sprite_height]
@@ -151,7 +150,7 @@ class CollectibleGem
   include Ray::Helper
 
   def initialize(pos)
-    @sprite = Ray::Sprite.new path_of("_media/CptnRuby Gem.png"), :at => pos
+    @sprite = Ray::Sprite.new path_of("CptnRuby Gem.png"), :at => pos
     @sprite.origin = @sprite.image.size / 2
 
     @animation = rotation(:from => -30, :to => 30, :duration => 0.6)
@@ -182,7 +181,7 @@ class CollectibleGem
 end
 
 class Map
-  Tileset  = path_of("_media/CptnRuby Tileset.png")
+  Tileset  = path_of("CptnRuby Tileset.png")
   PartSize = 60
   TileSize = 50
 
@@ -241,9 +240,9 @@ Ray.game "Captain Ruby" do
   scene :game do
     @half_size = window.size / 2
 
-    @sky  = sprite path_of("_media/Space.png")
+    @sky  = sprite path_of("Space.png")
 
-    @map  = Map.new path_of("_media/CptnRuby Map.txt")
+    @map  = Map.new path_of("CptnRuby Map.txt")
     @cptn = CptnRuby.new(@map, [400, 100])
 
     @camera = Ray::View.new @cptn.pos, window.size

data/samples/effects/effect.rb

@@ -0,0 +1,39 @@
+$:.unshift File.expand_path(File.dirname(__FILE__) + "/../../lib")
+$:.unshift File.expand_path(File.dirname(__FILE__) + "/../../ext")
+
+def path_of(res)
+  File.expand_path(File.dirname(__FILE__) + "/../../test/res/#{res}")
+end
+
+require 'ray'
+
+Ray.game "Some effects" do
+  register { add_hook :quit, method(:exit!) }
+
+  scene :shader do
+    @obj = sprite path_of("sprite.png")
+
+    effect_generator do |gen|
+      gen << color_inversion << grayscale
+      gen.build window.shader
+    end
+
+    @states = Hash.new(true)
+
+    {
+      :color_inversion => :i,
+      :grayscale       => :g
+    }.each do |state, key_name|
+      on :key_press, key(key_name) do
+        @states[state] = !@states[state]
+        window.shader["#{state}.enabled"] = @states[state]
+      end
+    end
+
+    render do |win|
+      win.draw @obj
+    end
+  end
+
+  scenes << :shader
+end