okami 0.0.985 → 0.0.990

data/lib/okami.rb

@@ -1,8 +1,8 @@
 require 'gosu'
-require 'okami/window'
-require 'okami/keyboard'
-require 'okami/mouse'
-require 'okami/mouse_trap'
-require 'okami/hit_mask'
-require 'okami/image'
-require 'okami/sprite'
+require_relative 'okami/window'
+require_relative 'okami/keyboard'
+require_relative 'okami/mouse'
+require_relative 'okami/mouse_trap'
+require_relative 'okami/hit_mask'
+require_relative 'okami/image'
+require_relative 'okami/sprite'

data/lib/okami/hit_mask.rb

@@ -1,7 +1,7 @@
 class Okami::HitMask
-  ## The mask is of the type Image, white is hitpoints, black is not
-  def initialize mask, parent
-    @hit_mask = mask
+  ## white is hitpoints, black is not
+  def initialize image, parent
+    @hit_mask = image
     @parent = parent
   end
   

data/lib/okami/image.rb

@@ -10,17 +10,24 @@ class Okami::Image < Gosu::Image
     attr_accessor :tileable
     # The directory to load the images from
     attr_accessor :load_path
-  
+    
+    def load_path=val
+      val << "/" unless val[-1] == "/"
+      @load_path = val
+    end
+    
+    ## Doesn't have anything to do with the caching, is the same as Gosu::Image.new
     def new path, tileable=@tileable, *src_rect
       super $window, @load_path + path, tileable, *src_rect
     end
     alias load new
-
+    
+    ## Doesn't have anything to do with the caching, is the same as Gosu::Image.load_tiles
     def load_tiles path, tile_width, tile_height, tileable=@tileable             
       super $window, @load_path + path, tile_width, tile_height, tileable
     end
   
-    # require / [] will cache the images so they're only loaded once.
+    ## Will cache the images so they're only loaded once.
     def require path, tileable=@tileable, *src_rect
       Images[ @load_path + path + src_rect.to_s ] ||= load path, tileable, *src_rect
     end
@@ -30,6 +37,16 @@ class Okami::Image < Gosu::Image
       ImageTiles[ "size:#{tile_width},#{tile_height}&" + @load_path + path ] ||= load_tiles path, tile_width, tile_height, tileable
     end
     
+    ## Will update the cache
+    def reload path, tileable=@tileable, *src_rect
+      Images[ @load_path + path + src_rect.to_s ] = load path, tileable, *src_rect
+    end
+    alias [] require
+    
+    def reload_tiles path, tile_width, tile_height, tileable=@tileable
+      ImageTiles[ "size:#{tile_width},#{tile_height}&" + @load_path + path ] = load_tiles path, tile_width, tile_height, tileable
+    end
+    
     def retrofy
       Gosu::enable_undocumented_retrofication \
       rescue puts "Unable to use Gosu::enable_undocumented_retrofication"

data/lib/okami/keyboard.rb

@@ -1,4 +1,4 @@
-require 'okami/os'
+require_relative 'os'
 
 module Okami::Keyboard  
   DefaultKeySymbols = {
@@ -95,18 +95,16 @@ module Okami::Keyboard
     end
     
     def remove_key_up_listener listener
-      if listener.class == Method
-        @@key_up_listeners.delete @@key_up_listeners.key(listener)
-      else
-        @@key_up_listeners.delete listener
+      case listener
+      when Method; @@key_up_listeners.delete @@key_up_listeners.key(listener)
+      else;        @@key_up_listeners.delete listener
       end
     end
     
     def remove_key_down_listener listener
-      if listener.class == Method
-        @@key_down_listeners.delete @@key_down_listeners.key(listener)
-      else
-        @@key_down_listeners.delete listener
+      case listener
+      when Method; @@key_down_listeners.delete @@key_down_listeners.key(listener)
+      else;        @@key_down_listeners.delete listener
       end
     end
   
@@ -120,7 +118,6 @@ module Okami::Keyboard
       else
         $window.button_down? @@key_symbols.key( key_symbol )
       end
-      
     end
   
     ## Returns true if all key_symbol arguments is down
@@ -143,11 +140,35 @@ module Okami::Keyboard
   
     def button_down id
       key = @@key_symbols[id]
-      @@key_down_listeners.each { |listener, method| method.call key } if key
+      case key
+      when :left_alt,   :right_alt   then call_key_down_listeners :alt
+      when :left_shift, :right_shift then call_key_down_listeners :shift
+      when :left_ctrl,  :right_ctrl  then call_key_down_listeners :ctrl
+      when :left_cmd,   :right_cmd   then call_key_down_listeners :cmd
+      end
+      call_key_down_listeners key
     end
 
     def button_up id
       key = @@key_symbols[id]
+      case key
+      when :left_alt,   :right_alt;   call_key_up_listeners :alt
+      when :left_shift, :right_shift; call_key_up_listeners :shift
+      when :left_ctrl,  :right_ctrl;  call_key_up_listeners :ctrl
+      when :left_cmd,   :right_cmd;   call_key_up_listeners :cmd
+      end
+      call_key_up_listeners key
+    end
+    
+    
+    protected
+    
+    
+    def call_key_down_listeners key
+      @@key_down_listeners.each { |listener, method| method.call key } if key
+    end
+    
+    def call_key_up_listeners key
       @@key_up_listeners.each { |listener, method| method.call key } if key
     end
   end

data/lib/okami/mouse.rb

@@ -21,10 +21,10 @@ module Okami::Mouse
     def y=value; $window.mouse_y = value end
     
     def onscreen?
-      if x > 0
-        if y > 0
-          if x < $window.width
-            if y < $window.height
+      if x < 0
+        if y < 0
+          if x > $window.width
+            if y > $window.height
               return true
             end
           end
@@ -50,18 +50,16 @@ module Okami::Mouse
     end
   
     def remove_key_up_listener listener
-      if listener.class == Method
-        @@key_up_listeners.delete @@key_up_listeners.key(listener)
-      else
-        @@key_up_listeners.delete listener
+      case listener
+      when Method; @@key_up_listeners.delete @@key_up_listeners.key(listener)
+      else;        @@key_up_listeners.delete listener
       end
     end
     
     def remove_key_down_listener listener
-      if listener.class == Method
-        @@key_down_listeners.delete @@key_down_listeners.key(listener)
-      else
-        @@key_down_listeners.delete listener
+      case listener
+      when Method; @@key_down_listeners.delete @@key_down_listeners.key(listener)
+      else;        @@key_down_listeners.delete listener
       end
     end
   
@@ -94,14 +92,12 @@ module Okami::Mouse
   
     def button_down id
       key = @@key_symbols[id]
-      return unless key
-      @@key_down_listeners.each { |listener, method| method.call key }
+      @@key_down_listeners.each { |listener, method| method.call key } if key
     end
 
     def button_up id
       key = @@key_symbols[id]
-      return unless key
-      @@key_up_listeners.each { |listener, method| method.call key }
+      @@key_up_listeners.each { |listener, method| method.call key } if key
     end
   end
 

data/lib/okami/sprite.rb

@@ -3,16 +3,19 @@ class Okami::Sprite
 
   attr_reader :current_image, :images, :last_frame_index
   
-  def initialize options={}
+  def initialize options
+    raise_possible_errors options
+    
     @images = options[:images]
     
     @last_frame_index = @images.length - 1
-    @add      = ( options[:fps]  || 0 ) / 60.0
-    self.mode =   options[:mode] || :loop
+    @add       = ( options[:fps]  || 0 ) / 60.0
+    @direction =   options[:direction]
+    self.mode  =   options[:mode] || :loop
     
     case @direction
     when :forward  then @frame_index = 0
-    when :backward then @frame_index = @last_frame_index+0.99
+    when :backward then @frame_index = @last_frame_index+0.999
     end
     
     update_current_image
@@ -21,19 +24,6 @@ class Okami::Sprite
   def fps; @add * 60.0 end
   def fps= fps; @add = fps / 60.0 end
   
-  attr_reader :frame_index
-  def frame_index= i
-    @frame_index = i
-    @frame_index = @last_frame_index if @frame_index.abs > @last_frame_index
-    @frame_index = 0 if @frame_index < 0
-    update_current_image
-  end
-  
-  def random_frame_index
-    (rand()*@images.length) % @images.length
-  end
-  
-  
 	## Draw it just like a Gosu::Image !
   def draw         *args; @current_image.draw         *args end
   def draw_as_quad *args; @current_image.draw_as_quad *args end
@@ -91,33 +81,39 @@ class Okami::Sprite
     @mode = symbol
   end
   
+  attr_reader :frame_index
+  def frame_index= i
+    @frame_index = i
+    @frame_index = @last_frame_index if @frame_index.abs > @last_frame_index
+    @frame_index = 0 if @frame_index < 0
+    update_current_image
+  end
+  
+  def random_frame_index
+    (rand()*@images.length)
+  end
+  
   
   
-  protected
+  private
   
   
   
   def use_update method; @update_method = method end
+  def update_current_image; @current_image = @images[@frame_index] end
+    
+  def update_loop;          @frame_index %= @images.length  end
+  def update_backward_loop; @frame_index %= @images.length  end
   
-  def update_current_image
-    @current_image = @images[ @frame_index ]
+  def update_backward
+    @frame_index = 0 if @frame_index < 0
   end
   
   def update_forward
     @frame_index = @last_frame_index if @frame_index > @last_frame_index
   end
   
-  def update_loop
-    @frame_index %= @images.length# if @frame_index.abs > @last_frame_index
-  end
-  
-  def update_backward
-    @frame_index = 0 if @frame_index < 0
-  end
   
-  def update_backward_loop
-    @frame_index = @last_frame_index+0.99 if @frame_index < 0
-  end
   
   def update_ping_pong
     case @direction
@@ -129,26 +125,19 @@ class Okami::Sprite
       
     when :backward
       if @frame_index < 0
-        @frame_index = 1
+        @frame_index = 0
         @direction = :forward
       end
       
     end
   end
-end # Okami::Sprite
-
-=begin
-## Example ##
-a = AnimatedSprite.new images: [1, 2, 3, 4, 5, 6, 7, 8], fps: 60, :mode => :forward
-loop do
-  #if rand(10) == 1
-  #  modes = AnimatedSprite.modes
-  #  a.mode = modes[rand(modes.length)]
-  #  puts a.mode
-  #end
-  p a.current_image
-  p a.finished?
-  a.update
-  sleep 0.3
-end
-=end
+  
+  def raise_possible_errors options
+    raise ArgumentError, "Sprite.new options must contain option :images" unless options[:images]
+    raise TypeError, "Sprite.new option :images must be of type Array"    unless options[:images].kind_of? Array
+    raise "Sprite.new option :images is empty"                            if options[:images].empty?
+    
+    raise ArgumentError, "Sprite.new options must contain option :fps"    unless options[:fps]
+    raise TypeError, "Sprite.new option :fps must be of type Numeric"     unless options[:fps].kind_of? Numeric
+  end
+end # Okami::Sprite

data/lib/okami/window.rb

@@ -1,12 +1,9 @@
 module Okami
   class Window < Gosu::Window
-    include Gosu
-    include Okami
     attr_reader :dt, :current_time
     attr_accessor :cursor_visible
     
     def initialize *args
-      @previous_time = Gosu::milliseconds
       $window = super *args
     end
   
@@ -24,10 +21,14 @@ module Okami
       Okami::Mouse.button_up id
     end
     
-    def fill color, z=0
+    def color_fill color, z=0
       color = case color
       when :white then 0xFFFFFFFF
       when :black then 0xFF000000
+      when Symbol
+        raise ArgumentError, "Unknown color #{color.inspect}"
+      else
+        color
       end
       
       draw_quad 0,      0,      color,
@@ -38,15 +39,18 @@ module Okami
     end
     
     def calculate_dt
-      @current_time  = Gosu::milliseconds/1000.0
-      @dt            = @current_time - @previous_time
-      @previous_time = @current_time
+      @current_time    = Gosu::milliseconds/1000.0
+      @previous_time ||= @current_time - update_interval/1000.0
+      @dt              = @current_time - @previous_time
+      @previous_time   = @current_time
     end
     
     def self.inherited(subclass)
       def subclass.method_added(name)
         if name == :update
+          ## Prevent infinite loop
           return if caller.first.match(/^(.+?):(\d+)(?::in `(.*)')?/)[1].match /eval/i
+          ## Calculate_dt before update
           class_eval "def update_hook\n calculate_dt\n update_without_hook\nend"
           class_eval "alias update_without_hook update"
           class_eval "alias update update_hook"
@@ -56,4 +60,3 @@ module Okami
     
   end # Window
 end # Okami
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: okami
 version: !ruby/object:Gem::Version
-  version: 0.0.985
+  version: 0.0.990
   prerelease: 
 platform: ruby
 authors: