ehb_game_lib 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bed38ad4e4913133709910358b6cefecc19b31806dbebf56fa0634436854df16
-  data.tar.gz: 6f5f10d50d575fd6318fb46ef148b779b2cb1dae36f221f9bb1f8c1c49af9ae4
+  metadata.gz: 42ec189978ad34c8ab1c64d5ba99e63ae27099553310cfa380e1cb2eec9bb19d
+  data.tar.gz: aabf62f8fcb17570c9088b3c94dc9d6c47c5900916cb7630e113f3672a3e8f1e
 SHA512:
-  metadata.gz: 56b31e0d389e0623a6eac2cef4b665b97f0bca16b3130c7f191d7d66186c5d35fd8f24e28bd1ce329433441edfffa64a77c839e5cdadefa0514abd6c1052681d
-  data.tar.gz: 49d76a3c978287e715977ec2c1117a437b698e1ede1a8de4c6e8f3340037198fcf8900d3459931db172e0a7011050b5be0f4c3163886b215c13f6c326db48eba
+  metadata.gz: 1964fd37af7244749fc0303dbe7c9504e2df777574ada1fb5cd7db174705e485363f45bbeacefb66c27ef2436b3f8c5c8b3926bcdc9004f37c81e0740f816fe0
+  data.tar.gz: e8de637269a0de65b42668c04df1632268689cbb26476803b2681d347e1b7ba49525272e5960697b5aca6cbe83f4f1d9a74aee32b7216b34e3c609c2b7217b98

data/lib/ehb_game_lib/math/rectable_object.rb

@@ -1,99 +1,50 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module EhbGameLib
   module Math
     module RectableObject
-      H_AXIS = { name: :ax, coord: :x, size: :width, floor: :left, mean: :center,
-                 ceil: :right }.freeze
-      V_AXIS = { name: :ay, coord: :y, size: :height, floor: :top, mean: :middle,
-                 ceil: :bottom }.freeze
-
-      [H_AXIS, V_AXIS].each do |a|
-        class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-          def #{a[:name]}
-            @#{a[:name]} ||= Axis.new(
-              -> { #{a[:coord]} },
-              -> (v) { self.#{a[:coord]} = v },
-              -> { #{a[:size]} }
+      require_sub __FILE__
+
+      [%i[ax x width x_anchor left center right], # rubocop:disable Metrics/BlockLength
+       %i[ay y height y_anchor top middle bottom]].each do |aa|
+        a = ::OpenStruct.new(
+          %i[name coord size anchor floor mean ceil]
+          .each_with_index.map { |k, i| [k, aa[i]] }.to_h
+        )
+
+        define_method a.name do
+          @data ||= {}
+          @data[a.name] ||=
+            Axis.new(
+              -> { send(a.coord) },
+              ->(v) { send("#{a.coord}=", v) },
+              -> { send(a.size) }
             )
-          end
-        RUBY_EVAL
-
-        %i[floor mean ceil].each do |m|
-          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def #{a[m]}
-              #{a[:name]}.#{m}
-            end
-
-            def #{a[m]}=(v)
-              #{a[:name]}.#{m} = v
-            end
-          RUBY_EVAL
-        end
-      end
-
-      def rect
-        ::Chingu::Rect.new(left, top, width, height)
-      end
-
-      class Axis
-        attr_accessor :anchor
-
-        def initialize(coord_get, coord_set, size_get)
-          @coord_get = coord_get
-          @coord_set = coord_set
-          @size_get = size_get
         end
 
-        def coord
-          @coord_get.call
-        end
+        %i[anchor floor mean ceil].each do |m|
+          define_method a[m] do |*args|
+            if args.count.zero?
+              send(a.name).send(m)
+            elsif args.count == 1
+              send(a.name).send("#{m}=", args[0])
 
-        def coord=(v)
-          @coord_set.call(v)
-        end
-
-        def size
-          @size_get.call
-        end
-
-        %w[floor mean ceil].each do |m|
-          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def #{m}
-              coord + #{m}_delta
+              self
+            else
+              raise ::ArgumentError, "Invalid number of arguments (#{args.count} for 0..1)"
             end
-
-            def #{m}=(v)
-              self.coord = v - #{m}_delta
-            end
-          RUBY_EVAL
-        end
-
-        private
-
-        def floor_delta
-          case anchor
-          when :mean then - size / 2
-          when :ceil then - size
-          else 0
           end
-        end
 
-        def mean_delta
-          case anchor
-          when :mean then 0
-          when :ceil then - size / 2
-          else size / 2
+          define_method "#{a[m]}=" do |v|
+            send(a.name).send("#{m}=", v)
           end
         end
+      end
 
-        def ceil_delta
-          case anchor
-          when :mean then size / 2
-          when :ceil then 0
-          else size
-          end
-        end
+      def rect
+        ::Chingu::Rect.new(left, top, width, height)
       end
     end
   end

data/lib/ehb_game_lib/math/rectable_object/axis.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EhbGameLib
+  module Math
+    module RectableObject
+      class Axis
+        attr_accessor :anchor
+
+        common_constructor :coord_get, :coord_set, :size_get
+
+        def coord
+          coord_get.call
+        end
+
+        def coord=(v)
+          coord_set.call(v)
+        end
+
+        def size
+          size_get.call
+        end
+
+        %w[floor mean ceil].each do |m|
+          define_method m do
+            coord + send("#{m}_delta")
+          end
+
+          define_method "#{m}=" do |v|
+            self.coord = v - send("#{m}_delta")
+          end
+        end
+
+        private
+
+        def floor_delta
+          case anchor
+          when :mean then - size / 2
+          when :ceil then - size
+          else 0
+          end
+        end
+
+        def mean_delta
+          case anchor
+          when :mean then 0
+          when :ceil then - size / 2
+          else size / 2
+          end
+        end
+
+        def ceil_delta
+          case anchor
+          when :mean then size / 2
+          when :ceil then 0
+          else size
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehb_game_lib/palettes/color.rb

@@ -19,8 +19,10 @@ module EhbGameLib
           quantum
         end
 
-        def quantum_to_magick_range(quantum)
-          ((quantum / QUANTUM_MAX.to_f) * ::Magick::QuantumRange).floor
+        def quantum_to_magick_range(quantum, invert = false)
+          r = ((quantum / QUANTUM_MAX.to_f) * ::Magick::QuantumRange).floor
+          r = ::Magick::QuantumRange - r if invert
+          r
         end
 
         # @return [Array<EhbGameLib::Palettes::Color>]
@@ -54,7 +56,8 @@ module EhbGameLib
       # @return [Magick::Pixel]
       def magick_pixel
         @magick_pixel ||= ::Magick::Pixel.new(
-          *[red, green, blue, alpha].map { |n| self.class.quantum_to_magick_range(n) }
+          *[red, green, blue].map { |n| self.class.quantum_to_magick_range(n) },
+          self.class.quantum_to_magick_range(alpha, true)
         )
       end
 

data/lib/ehb_game_lib/palettes/sprite.rb

@@ -16,7 +16,9 @@ module EhbGameLib
         end
       end
 
-      common_constructor :magick_image
+      common_constructor :magick_image do
+        magick_image.alpha(::Magick::ActivateAlphaChannel)
+      end
 
       # @return Gosu::Image
       def gosu_image

data/lib/ehb_game_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EhbGameLib
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehb_game_lib
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chingu
@@ -154,6 +154,7 @@ files:
 - lib/ehb_game_lib/math/line_segment.rb
 - lib/ehb_game_lib/math/quadratic_equation.rb
 - lib/ehb_game_lib/math/rectable_object.rb
+- lib/ehb_game_lib/math/rectable_object/axis.rb
 - lib/ehb_game_lib/math/vector.rb
 - lib/ehb_game_lib/media_path.rb
 - lib/ehb_game_lib/nes.rb