okami 0.0.993 → 0.1.0

data/lib/okami.rb

@@ -1,8 +1,18 @@
 require 'gosu'
-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'
+
+module Okami
+  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/image_tiles_cache'
+  require_relative 'okami/image_cache'
+  require_relative 'okami/sprite'
+  
+  def self.retrofy
+    Gosu::enable_undocumented_retrofication \
+    rescue puts "Unable to use Gosu::enable_undocumented_retrofication"
+  end
+end

data/lib/okami/drawable.rb

@@ -0,0 +1,73 @@
+require_relative 'wrapping_angle'
+
+module Okami::Drawable
+  @default_center_x = 0
+  @default_center_y = 0
+  
+  class << self
+    attr_accessor :default_center_x, :default_center_y
+  end
+  
+  attr_accessor :x, :y, :z
+  attr_accessor :center_x, :center_y
+  attr_accessor :color, :draw_mode
+  
+  def init_drawable
+    @factor_x = 1
+    @factor_y = 1
+    self.center_x = Okami::Drawable.default_center_x
+    self.center_y = Okami::Drawable.default_center_y
+    @x = 0
+    @y = 0
+    @z = 0
+    @wrapping_angle = WrappingAngle.new
+    @wrapping_angle.degrees = 0
+    @degrees = @wrapping_angle.degrees
+    @color = 0xFFFFFFFF
+    @draw_mode = :default
+    @color = Gosu::Color.argb(255, 255, 255, 255)
+    @alpha = 1.0
+  end
+  
+  def draw
+    @image.draw_rot @x, @y, @z, @degrees, @center_x, @center_y, @factor_x, @factor_y, @color, @draw_mode
+  end
+  
+  def rotate_radians  a; @wrapping_angle.rotate_radians  a; @degrees = @wrapping_angle.degrees  end
+  def rotate_fraction a; @wrapping_angle.rotate_fraction a; @degrees = @wrapping_angle.degrees  end
+  def rotate_degrees  a; @wrapping_angle.rotate_degrees  a; @degrees = @wrapping_angle.degrees  end
+  
+  def radians;  @wrapping_angle.radians    end
+  def fraction; @wrapping_angle.fraction   end
+  def degrees;  @wrapping_angle.degrees    end
+  
+  def radians=  a; @wrapping_angle.radians  = a; @degrees = @wrapping_angle.degrees  end
+  def fraction= a; @wrapping_angle.fraction = a; @degrees = @wrapping_angle.degrees  end
+  def degrees=  a; @wrapping_angle.degrees  = a; @degrees = @wrapping_angle.degrees  end
+    
+  attr_reader :alpha
+  def alpha=a
+    @alpha = a
+    @color.alpha = a*255
+  end
+
+  def argb= a, r, g, b
+    @color.alpha  = a * 255
+    @color.red    = r * 255
+    @color.green  = g * 255
+    @color.blue   = b * 255
+  end
+  
+  def rgba= r, g, b, a
+    @color.red    = r * 255
+    @color.green  = g * 255
+    @color.blue   = b * 255
+    @color.alpha  = a * 255
+  end
+  
+  def rgb=
+    @color.red    = r * 255
+    @color.green  = g * 255
+    @color.blue   = b * 255
+  end
+end

data/lib/okami/image.rb

@@ -1,11 +1,17 @@
-class Okami::Image < Gosu::Image
+require_relative 'drawable'
+
+class Okami::Image
+  include Okami::Drawable
+  
+  def initialize image_path
+    @image = Okami::ImageCache[image_path]
+    init_drawable
+  end
+  
   @tileable = true
   @load_path = ""
   
   class << self
-    Images = {}
-    ImageTiles = {}
-    
     # Set this for a default value for wether the images should be tileable or not
     attr_accessor :tileable
     # The directory to load the images from
@@ -15,42 +21,5 @@ class Okami::Image < Gosu::Image
       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
-  
-    ## 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
-    alias [] require
-    
-    def require_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
-    
-    ## 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"
-    end
-      
   end
-end
+end

data/lib/okami/image_cache.rb

@@ -0,0 +1,18 @@
+Okami::Images = {}
+
+class Okami::ImageCache
+  class << self    
+    ## Will cache the images so they're only loaded once.
+    def require path, tileable=Okami::Image.tileable, *src_rect
+      path = Okami::Image.load_path + path
+      Okami::Images[ path + src_rect.to_s ] ||= Gosu::Image.new $window, path, tileable, *src_rect
+    end
+    alias [] require
+    
+    ## Will load and cache even if it's already cached
+    def load path, tileable=Okami::Image.tileable, *src_rect
+      path = Okami::Image.load_path + path
+      Okami::Images[ path + src_rect.to_s ] = Gosu::Image.new $window, path, tileable, *src_rect
+    end
+  end
+end

data/lib/okami/image_tiles_cache.rb

@@ -0,0 +1,17 @@
+Okami::ImageTiles = {}
+
+class Okami::ImageTilesCache
+  class << self        
+    def require path, tile_width, tile_height, tileable=Okami::Image.tileable
+      path = Okami::Image.load_path + path
+      Okami::ImageTiles[ "size:#{tile_width},#{tile_height}&" + path ] ||= Gosu::Image.load_tiles $window, path, tile_width, tile_height, tileable
+    end
+    alias [] require
+    
+    ## Will load and cache even if it's already cached
+    def load path, tile_width, tile_height, tileable=Okami::Image.tileable
+      path = Okami::Image.load_path + path
+      Okami::ImageTiles[ "size:#{tile_width},#{tile_height}&" + path ] = Gosu::Image.load_tiles $window, path, tile_width, tile_height, tileable
+    end
+  end
+end

data/lib/okami/keyboard.rb

@@ -71,7 +71,7 @@ module Okami::Keyboard
     Gosu::KbZ => :z
   }
   
-  if OS.mac?
+  if Okami::OS.mac?
     DefaultKeySymbols[55] = :left_cmd
     DefaultKeySymbols[54] = :right_cmd
   end

data/lib/okami/os.rb

@@ -1,4 +1,4 @@
-module OS
+module Okami::OS
   @@system =
   case RUBY_PLATFORM
   when /darwin/i then :mac

data/lib/okami/sprite.rb

@@ -1,39 +1,31 @@
+require_relative 'drawable'
+
 class Okami::Sprite
-  Modes = [:forward, :loop, :backward, :backward_loop, :ping_pong]
+  include Okami::Drawable
+  AnimationModes = [:forward, :loop, :backward, :backward_loop, :ping_pong]
 
-  attr_reader :current_image, :images, :last_frame_index
+  attr_reader :image, :images, :last_frame_index
   
   def initialize options
     raise_possible_errors options
+    options[:animation_mode] ||= :loop
     
-    @images = options[:images]
-    
-    @last_frame_index = @images.length - 1
-    @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.999
+    options.each do |key, value|
+      send "#{key}=", value
     end
     
+    set_initial_frame_index
+    init_drawable
     update_current_image
   end
   
-  def fps; @add * 60.0 end
-  def fps= fps; @add = fps / 60.0 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
-  def draw_rot     *args; @current_image.draw_rot     *args end
-  
+  def fps;      @delta_frame_index * 60.0         end
+  def fps=fps;  @delta_frame_index = fps / 60.0   end
   
   def update
     case @direction
-    when :forward  then @frame_index += @add*$window.dt*60.0
-    when :backward then @frame_index -= @add*$window.dt*60.0
+    when :forward  then @frame_index += @delta_frame_index*$window.dt*60.0
+    when :backward then @frame_index -= @delta_frame_index*$window.dt*60.0
     end
     
     @update_method.call
@@ -42,15 +34,15 @@ class Okami::Sprite
   
   
   def finished?
-    case @mode
+    case @animation_mode
     when :forward;  @frame_index == @last_frame_index
     when :backward; @frame_index == 0
     end
   end
   alias animation_finished? finished?
   
-  attr_reader :mode
-  def mode= symbol
+  attr_reader :animation_mode
+  def animation_mode= symbol
     case symbol
     when :loop
       @direction = :forward
@@ -73,12 +65,12 @@ class Okami::Sprite
       use_update method :update_ping_pong
       
     else
-      puts "Supported AnimatedSprite modes:"
-      puts self.class.modes
-      raise ArgumentError, "AnimatedSprite, mode #{symbol.inspect} not supported"
+      puts "Supported AnimatedSprite animation modes:"
+      puts AnimationModes
+      raise ArgumentError, "AnimatedSprite, animation_mode #{symbol.inspect} not supported"
     end
     
-    @mode = symbol
+    @animation_mode = symbol
   end
   
   attr_reader :frame_index
@@ -93,14 +85,28 @@ class Okami::Sprite
     (rand()*@images.length)
   end
   
+  protected
   
+  def images=images
+    @images = images
+    @last_frame_index  = @images.length - 1
+  end
   
-  private
+  def direction=direction
+    @direction = direction
+  end
   
+  private
   
+  def set_initial_frame_index
+    case @direction
+    when :forward  then @frame_index = 0
+    when :backward then @frame_index = @last_frame_index+0.999
+    end
+  end
   
   def use_update method; @update_method = method end
-  def update_current_image; @current_image = @images[@frame_index] end
+  def update_current_image; @image = @images[@frame_index] end
     
   def update_loop;          @frame_index %= @images.length  end
   def update_backward_loop; @frame_index %= @images.length  end
@@ -112,20 +118,18 @@ class Okami::Sprite
   def update_forward
     @frame_index = @last_frame_index if @frame_index > @last_frame_index
   end
-  
-  
-  
+    
   def update_ping_pong
     case @direction
     when :forward
-      if @frame_index >= @last_frame_index
+      if @frame_index >= @last_frame_index+0.5
         @direction = :backward
-        @frame_index = @last_frame_index
+        @frame_index = @last_frame_index+0.5
       end
       
     when :backward
-      if @frame_index < 0
-        @frame_index = 0
+      if @frame_index < 0.5
+        @frame_index = 0.5
         @direction = :forward
       end
       

data/lib/okami/window.rb

@@ -21,16 +21,7 @@ module Okami
       Okami::Mouse.button_up id
     end
     
-    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
-      
+    def fill color, z=0      
       draw_quad 0,      0,      color,
                 width,  0,      color,
                 0,      height, color,

data/lib/okami/wrapping_angle.rb

@@ -0,0 +1,44 @@
+class WrappingAngle  
+  Tau = Math::PI * 2
+  
+  def initialize
+    @c = Complex(0,1)
+  end
+  
+  def rotate_radians  a; @c *= Complex(0,1)**(a/Tau * 4)  end
+  def rotate_fraction a; @c *= Complex(0,1)**(a*4)        end
+  def rotate_degrees  a; @c *= Complex(0,1)**(a/90.0)     end
+  
+  def radians;  @c.angle              end
+  def fraction; @c.angle / Tau        end
+  def degrees;  @c.angle / Tau * 360  end
+  
+  def radians=  a; @c = Complex(0,1)**(a/Tau * 4) end
+  def fraction= a; @c = Complex(0,1)**(a*4.0)     end
+  def degrees=  a; @c = Complex(0,1)**(a/90.0)    end
+  
+  ### Displaying
+  
+  begin
+    require 'fraction'
+    def pretty_angle unit=@standard_unit
+      case unit
+      when :degrees
+        "#{angle(:degrees).round}°"
+      when :fraction, :radians
+        nom, den = angle(:fraction).fraction
+        return "0τ" if nom == 0
+        return "#{nom}/#{den}τ"
+      end
+    end
+  rescue LoadError
+    def pretty_angle unit=@standard_unit
+      case unit
+      when :degrees;  "#{angle(:degrees).round}°"
+      when :radians; "#{angle(:radians)} radians"
+      when :fraction;  "#{angle(:fraction)}"
+      end
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: okami
 version: !ruby/object:Gem::Version
-  version: 0.0.993
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -50,14 +50,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/okami.rb
+- lib/okami/drawable.rb
 - lib/okami/window.rb
 - lib/okami/keyboard.rb
 - lib/okami/mouse.rb
 - lib/okami/mouse_trap.rb
 - lib/okami/image.rb
+- lib/okami/image_cache.rb
+- lib/okami/image_tiles_cache.rb
 - lib/okami/hit_mask.rb
 - lib/okami/sprite.rb
 - lib/okami/os.rb
+- lib/okami/wrapping_angle.rb
 homepage: https://github.com/Aerotune/Okami
 licenses: []
 post_install_message: