fidgit 0.2.4 → 0.2.5

data/lib/fidgit/gosu_ext/color.rb

@@ -1,136 +1,136 @@
-# encoding: utf-8
-
-module Gosu
-  class Color
-    # Is the color completely transparent?
-    def transparent?; alpha == 0; end
-    # Is the color completely opaque?
-    def opaque?; alpha == 255; end
-
-    # RGB in 0..255 format (Alpha assumed 255)
-    #
-    # @param [Integer] red
-    # @param [Integer] green
-    # @param [Integer] blue
-    # @return [Color]
-    def self.rgb(red, green, blue)
-      new(255, red, green, blue)
-    end
-
-    # RGBA in 0..255 format
-    #
-    # @param [Integer] red
-    # @param [Integer] green
-    # @param [Integer] blue
-    # @param [Integer] alpha
-    # @return [Color]
-    def self.rgba(red, green, blue, alpha)
-      new(alpha, red, green, blue)
-    end
-
-    # ARGB in 0..255 format (equivalent to Color.new, but explicit)
-    #
-    # @param [Integer] alpha
-    # @param (see Color.rgb)
-    # @return [Color]
-    def self.argb(alpha, red, green, blue)
-      new(alpha, red, green, blue)
-    end
-
-    # HSV format (alpha assumed to be 255)
-    #
-    # @param [Float] hue 0.0..360.0
-    # @param [Float] saturation 0.0..1.0
-    # @param [Float] value 0.0..1.0
-    # @return [Color]
-    def self.hsv(hue, saturation, value)
-      from_hsv(hue, saturation, value)
-    end
-
-    # HSVA format
-    #
-    # @param [Float] hue 0.0..360.0
-    # @param [Float] saturation 0.0..1.0
-    # @param [Float] value 0.0..1.0
-    # @param [Integer] alpha 1..255
-    # @return [Color]
-    def self.hsva(hue, saturation, value, alpha)
-      from_ahsv(alpha, hue, saturation, value)
-    end
-
-    class << self
-      alias_method :ahsv, :from_ahsv
-    end
-
-    # Convert from an RGBA array, as used by TexPlay.
-    #
-    # @param [Array<Float>] color TexPlay color [r, g, b, a] in range 0.0..1.0
-    # @return [Color]
-    def self.from_tex_play(color)
-      rgba(*color.map {|c| (c * 255).to_i })
-    end
-
-    # Convert to an RGBA array, as used by TexPlay.
-    #
-    # @return [Array<Float>] TexPlay color array [r, g, b, a] in range 0.0..1.0
-    def to_tex_play
-      [red / 255.0, green / 255.0, blue / 255.0,  alpha / 255.0]
-    end
-
-    # Convert to a 6-digit hexadecimal value, appropriate for passing to the Gosu +<c>+ tag. The alpha channel is ignored.
-    #
-    # @return [String] RGB hexadecimal string, such as "AABB00"
-    def to_hex
-      "%02x%02x%02x" % [red, green, blue]
-    end
-
-    # Colorize text for in-line rendering by Gosu.
-    # e.g. "frog" => "<c=00ff9a>frog</c>"
-    def colorize(text)
-      "<c=#{to_hex}>#{text}</c>"
-    end
-
-    # Show the Color as <RGBA [0, 0, 0, 0]> or, if opaque, <RGB [0, 0, 0]> (Gosu default is '(ARGB:0/0/0/0)')
-    def to_s
-      if opaque?
-        "<RGB [#{red}, #{green}, #{blue}]>"
-      else
-        "<RGBA [#{red}, #{green}, #{blue}, #{alpha}]>"
-      end
-    end
-
-    def +(other)
-      raise ArgumentError, "Can only add another #{self.class}" unless other.is_a? Color
-
-      copy = Color.new(0)
-
-      copy.red = [red + other.red, 255].min
-      copy.green = [green + other.green, 255].min
-      copy.blue = [blue + other.blue, 255].min
-      copy.alpha = [alpha + other.alpha, 255].min
-
-      copy
-    end
-
-    def -(other)
-      raise ArgumentError, "Can only take away another #{self.class}" unless other.is_a? Color
-
-      copy = Color.new(0)
-
-      copy.red = [red - other.red, 0].max
-      copy.green = [green - other.green, 0].max
-      copy.blue = [blue - other.blue, 0].max
-      copy.alpha = [alpha - other.alpha, 0].max
-
-      copy
-    end
-
-    def ==(other)
-      if other.is_a? Color
-        red == other.red and green == other.green and blue == other.blue and alpha == other.alpha
-      else
-        false
-      end
-    end
-  end
+# encoding: utf-8
+
+module Gosu
+  class Color
+    # Is the color completely transparent?
+    def transparent?; alpha == 0; end
+    # Is the color completely opaque?
+    def opaque?; alpha == 255; end
+
+    # RGB in 0..255 format (Alpha assumed 255)
+    #
+    # @param [Integer] red
+    # @param [Integer] green
+    # @param [Integer] blue
+    # @return [Color]
+    def self.rgb(red, green, blue)
+      new(255, red, green, blue)
+    end
+
+    # RGBA in 0..255 format
+    #
+    # @param [Integer] red
+    # @param [Integer] green
+    # @param [Integer] blue
+    # @param [Integer] alpha
+    # @return [Color]
+    def self.rgba(red, green, blue, alpha)
+      new(alpha, red, green, blue)
+    end
+
+    # ARGB in 0..255 format (equivalent to Color.new, but explicit)
+    #
+    # @param [Integer] alpha
+    # @param (see Color.rgb)
+    # @return [Color]
+    def self.argb(alpha, red, green, blue)
+      new(alpha, red, green, blue)
+    end
+
+    # HSV format (alpha assumed to be 255)
+    #
+    # @param [Float] hue 0.0..360.0
+    # @param [Float] saturation 0.0..1.0
+    # @param [Float] value 0.0..1.0
+    # @return [Color]
+    def self.hsv(hue, saturation, value)
+      from_hsv(hue, saturation, value)
+    end
+
+    # HSVA format
+    #
+    # @param [Float] hue 0.0..360.0
+    # @param [Float] saturation 0.0..1.0
+    # @param [Float] value 0.0..1.0
+    # @param [Integer] alpha 1..255
+    # @return [Color]
+    def self.hsva(hue, saturation, value, alpha)
+      from_ahsv(alpha, hue, saturation, value)
+    end
+
+    class << self
+      alias_method :ahsv, :from_ahsv
+    end
+
+    # Convert from an RGBA array, as used by TexPlay.
+    #
+    # @param [Array<Float>] color TexPlay color [r, g, b, a] in range 0.0..1.0
+    # @return [Color]
+    def self.from_tex_play(color)
+      rgba(*color.map {|c| (c * 255).to_i })
+    end
+
+    # Convert to an RGBA array, as used by TexPlay.
+    #
+    # @return [Array<Float>] TexPlay color array [r, g, b, a] in range 0.0..1.0
+    def to_tex_play
+      [red / 255.0, green / 255.0, blue / 255.0,  alpha / 255.0]
+    end
+
+    # Convert to a 6-digit hexadecimal value, appropriate for passing to the Gosu +<c>+ tag. The alpha channel is ignored.
+    #
+    # @return [String] RGB hexadecimal string, such as "AABB00"
+    def to_hex
+      "%02x%02x%02x" % [red, green, blue]
+    end
+
+    # Colorize text for in-line rendering by Gosu.
+    # e.g. "frog" => "<c=00ff9a>frog</c>"
+    def colorize(text)
+      "<c=#{to_hex}>#{text}</c>"
+    end
+
+    # Show the Color as <RGBA [0, 0, 0, 0]> or, if opaque, <RGB [0, 0, 0]> (Gosu default is '(ARGB:0/0/0/0)')
+    def to_s
+      if opaque?
+        "<RGB [#{red}, #{green}, #{blue}]>"
+      else
+        "<RGBA [#{red}, #{green}, #{blue}, #{alpha}]>"
+      end
+    end
+
+    def +(other)
+      raise ArgumentError, "Can only add another #{self.class}" unless other.is_a? Color
+
+      copy = Color.new(0)
+
+      copy.red = [red + other.red, 255].min
+      copy.green = [green + other.green, 255].min
+      copy.blue = [blue + other.blue, 255].min
+      copy.alpha = [alpha + other.alpha, 255].min
+
+      copy
+    end
+
+    def -(other)
+      raise ArgumentError, "Can only take away another #{self.class}" unless other.is_a? Color
+
+      copy = Color.new(0)
+
+      copy.red = [red - other.red, 0].max
+      copy.green = [green - other.green, 0].max
+      copy.blue = [blue - other.blue, 0].max
+      copy.alpha = [alpha - other.alpha, 0].max
+
+      copy
+    end
+
+    def ==(other)
+      if other.is_a? Color
+        red == other.red and green == other.green and blue == other.blue and alpha == other.alpha
+      else
+        false
+      end
+    end
+  end
 end

data/lib/fidgit/gosu_ext/gosu_module.rb

@@ -1,25 +1,25 @@
-module Gosu
-  class << self
-    alias_method :register_entity_fidgit, :register_entity
-
-    protected
-    def init_entities
-      @entities = {}
-    end
-
-    public
-    def register_entity(name, image)
-      name = name.to_sym
-      register_entity_fidgit(name, image)
-      @entities[name] = image
-      nil
-    end
-
-    public
-    def entity(name)
-      @entities[name.to_sym]
-    end
-  end
-
-  init_entities
+module Gosu
+  class << self
+    alias_method :register_entity_fidgit, :register_entity
+
+    protected
+    def init_entities
+      @entities = {}
+    end
+
+    public
+    def register_entity(name, image)
+      name = name.to_sym
+      register_entity_fidgit(name, image)
+      @entities[name] = image
+      nil
+    end
+
+    public
+    def entity(name)
+      @entities[name.to_sym]
+    end
+  end
+
+  init_entities
 end

data/lib/fidgit/history.rb

@@ -1,91 +1,91 @@
-# encoding: utf-8
-
-module Fidgit
-  # Manages a history of actions, along with doing, undoing and redoing those actions.
-  class History
-    # Maximum number of actions in the History before Actions are deleted.
-    DEFAULT_MAX_SIZE = 250
-
-    # An action in the History. Inherit actions from this in order to add them to a History.
-    class Action
-      # Perform the action.
-      def do; raise NotImplementedError, "#{self.class} does not have a do method defined"; end
-
-      # Reverse the action.
-      def undo; raise NotImplementedError, "#{self.class} does not have an undo method defined"; end
-    end
-
-    # Is there an action that can be undone?
-    def can_undo?; @last_done >= 0; end
-
-    # Is there an action that has been undone that can now be redone?
-    def can_redo?; @last_done < (@actions.size - 1); end
-
-    def initialize(max_size = DEFAULT_MAX_SIZE)
-      @max_size = max_size
-      @actions = []
-      @last_done = -1 # Last command that was performed.
-    end
-
-    # Perform a History::Action, adding it to the history.
-    # If there are currently any actions that have been undone, they will be permanently lost and cannot be redone.
-    #
-    # @param [History::Action] action Action to be performed
-    def do(action)
-      raise ArgumentError, "Parameter, 'action', expected to be a #{Action}, but received: #{action}" unless action.is_a? Action
-
-      # Remove all undone actions when a new one is performed.
-      if can_redo?
-        if @last_done == -1
-          @actions.clear
-        else
-          @actions = @actions[0..@last_done]
-        end
-      end
-
-      # If history is too big, remove the oldest action.
-      if @actions.size >= @max_size
-        @actions.shift
-      end
-
-      @last_done = @actions.size
-      @actions << action
-      action.do
-
-      nil
-    end
-
-    # Perform a History::Action, replacing the last action that was performed.
-    #
-    # @param [History::Action] action Action to be performed
-    def replace_last(action)
-      raise ArgumentError, "Parameter, 'action', expected to be a #{Action}, but received: #{action}" unless action.is_a? Action
-
-      @actions[@last_done].undo
-      @actions[@last_done] = action
-      action.do
-
-      nil
-    end
-
-    # Undo the last action that was performed.
-    def undo
-      raise "Can't undo unless there are commands in past" unless can_undo?
-
-      @actions[@last_done].undo
-      @last_done -= 1
-
-      nil
-    end
-
-    # Redo the last action that was undone.
-    def redo
-      raise "Can't redo if there are no commands in the future" unless can_redo?
-
-      @last_done += 1
-      @actions[@last_done].do
-
-      nil
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  # Manages a history of actions, along with doing, undoing and redoing those actions.
+  class History
+    # Maximum number of actions in the History before Actions are deleted.
+    DEFAULT_MAX_SIZE = 250
+
+    # An action in the History. Inherit actions from this in order to add them to a History.
+    class Action
+      # Perform the action.
+      def do; raise NotImplementedError, "#{self.class} does not have a do method defined"; end
+
+      # Reverse the action.
+      def undo; raise NotImplementedError, "#{self.class} does not have an undo method defined"; end
+    end
+
+    # Is there an action that can be undone?
+    def can_undo?; @last_done >= 0; end
+
+    # Is there an action that has been undone that can now be redone?
+    def can_redo?; @last_done < (@actions.size - 1); end
+
+    def initialize(max_size = DEFAULT_MAX_SIZE)
+      @max_size = max_size
+      @actions = []
+      @last_done = -1 # Last command that was performed.
+    end
+
+    # Perform a History::Action, adding it to the history.
+    # If there are currently any actions that have been undone, they will be permanently lost and cannot be redone.
+    #
+    # @param [History::Action] action Action to be performed
+    def do(action)
+      raise ArgumentError, "Parameter, 'action', expected to be a #{Action}, but received: #{action}" unless action.is_a? Action
+
+      # Remove all undone actions when a new one is performed.
+      if can_redo?
+        if @last_done == -1
+          @actions.clear
+        else
+          @actions = @actions[0..@last_done]
+        end
+      end
+
+      # If history is too big, remove the oldest action.
+      if @actions.size >= @max_size
+        @actions.shift
+      end
+
+      @last_done = @actions.size
+      @actions << action
+      action.do
+
+      nil
+    end
+
+    # Perform a History::Action, replacing the last action that was performed.
+    #
+    # @param [History::Action] action Action to be performed
+    def replace_last(action)
+      raise ArgumentError, "Parameter, 'action', expected to be a #{Action}, but received: #{action}" unless action.is_a? Action
+
+      @actions[@last_done].undo
+      @actions[@last_done] = action
+      action.do
+
+      nil
+    end
+
+    # Undo the last action that was performed.
+    def undo
+      raise "Can't undo unless there are commands in past" unless can_undo?
+
+      @actions[@last_done].undo
+      @last_done -= 1
+
+      nil
+    end
+
+    # Redo the last action that was undone.
+    def redo
+      raise "Can't redo if there are no commands in the future" unless can_redo?
+
+      @last_done += 1
+      @actions[@last_done].do
+
+      nil
+    end
+  end
 end