mineskin 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ad5a0b0f013880ad8da88118d4fc97f2e2c5cf
-  data.tar.gz: ed9dedbc558433fbd8a8ff74d477fe6ebd49c4cf
+  metadata.gz: 79a3caa2954d3207de917a57e2898b5c204e291d
+  data.tar.gz: b63fd32460ca646080ecdab1544b9204d034bf56
 SHA512:
-  metadata.gz: b1d186e77ac6a4ef8fa2f3f3d70f75dd28fe903182f4edbb2da927dedde18a4210711b8c24abd6c37bcbdca0d191cd152ee74a89c7882fd37d17e80be8308346
-  data.tar.gz: 7c60577555742245618811e2baadf037d71e3fd2e25c2533253e76a11de71faae7755a42fe12e274edfd9a692662878348b5b8aec3ae2d2dfd227ccb411b113e
+  metadata.gz: 05f9b4ed7af32aa228707867bf4a43259769c34e8cd3e02a535bde3fb9ff3ce0e0b77d2eba50251c311c58a47522f3b37d108b4f28b17901a0b213b6c8194eda
+  data.tar.gz: 6d42c92f63f97c1fdee0dd697f15f88c1b2a37b8defaba4aa077d6304e2376c4640fd63bfcdd47f023615b7c7ee39690e4d5d5fe251b37e51dda810941cf4c50

data/lib/mineskin.rb

@@ -1,3 +1,4 @@
 require 'mineskin/version'
 require 'mineskin/preview'
 require 'mineskin/skin_data'
+require 'mineskin/cape_data'

data/lib/mineskin/cape_data.rb

@@ -0,0 +1,38 @@
+require 'rmagick'
+require 'mineskin/unit'
+require 'mineskin/extractor'
+require 'mineskin/types'
+
+module MineSkin
+  class CapeData
+    include Unit
+    include Extractor
+
+    attr_accessor :cape
+    attr_reader :unit
+
+    def initialize(filename)
+      @image = Magick::Image.read(filename).first
+      # rubocop:disable ConditionalAssignment
+      if (@image.columns.to_f / @image.rows.to_f) == (22.0 / 17.0)
+        @unit = (@image.columns / 22.0).ceil
+      else
+        @unit = (@image.columns / 64.0).ceil
+      end
+      extract_cape!
+    end
+
+    protected
+
+    def extract_cape!
+      @cape = extract(
+        top:    { texture: [1,  0, 10, 1],  overlay: nil },
+        bottom: { texture: [11, 0, 10, 1],  overlay: nil },
+        right:  { texture: [0,  1, 1,  16], overlay: nil },
+        left:   { texture: [11, 1, 1,  16], overlay: nil },
+        front:  { texture: [12, 1, 10, 16], overlay: nil },
+        back:   { texture: [1,  1, 10, 16], overlay: nil }
+      )
+    end
+  end
+end

data/lib/mineskin/compositor.rb

@@ -0,0 +1,25 @@
+module MineSkin
+  # Composition tools
+  module Compositor
+    def resize(img, old_unit)
+      img.sample(@unit.to_f / old_unit.to_f)
+    end
+
+    # rubocop:disable MethodLength
+    def composite_texture!(tex, x, y, old_unit, op: Magick::SrcOverCompositeOp)
+      @image.composite!(
+        resize(tex.texture, old_unit),
+        x * @unit,
+        y * @unit,
+        op
+      )
+      @image.composite!(
+        resize(tex.overlay, old_unit),
+        x * @unit,
+        y * @unit,
+        op
+      ) if tex.overlay
+    end
+    # rubocop:enable MethodLength
+  end
+end

data/lib/mineskin/extractor.rb

@@ -0,0 +1,62 @@
+require 'mineskin/types'
+
+module MineSkin
+  module Extractor
+    # Extracts texture
+    # @param [Hash] texture Texture coordinates (x,y,width,height)
+    # @return [Magick::Image] Image part
+    def crop(texture)
+      @image.crop(
+        texture[:x] * @unit,
+        texture[:y] * @unit,
+        texture[:width] * @unit,
+        texture[:height] * @unit
+      )
+    end
+
+    # Constructs a Texture object from given regions
+    # @param [Hash,Array] texture Texture coordinates in array or hash
+    # @param [Hash, Array, nil] overlay Optional overlay coords
+    # @return [MineSkin::Texture] Texture object
+    def part(texture: { x: 0, y: 0, width: 0, height: 0 }, overlay: nil)
+      tex = crop coords_to_h texture
+
+      part = Texture.new(tex, nil)
+      if overlay
+        over = crop coords_to_h overlay
+        part.overlay = over
+      end
+
+      part
+    end
+
+    # Constructs a Cuboid from given regions
+    # @param [Hash] hash Region data
+    # @return [MineSkin::Cuboid] Cuboid object
+    def extract(hash)
+      Cuboid.new(
+        part(hash[:top]),
+        part(hash[:bottom]),
+        part(hash[:left]),
+        part(hash[:right]),
+        part(hash[:front]),
+        part(hash[:back])
+      )
+    end
+
+    protected
+
+    def coords_to_h(c)
+      if c.is_a? Array
+        {
+          x: c[0],
+          y: c[1],
+          width: c[2],
+          height: c[3]
+        }
+      else
+        c
+      end
+    end
+  end
+end

data/lib/mineskin/preview.rb

@@ -1 +1,2 @@
-require 'mineskin/preview/2d'
+require 'mineskin/preview/skin2d'
+require 'mineskin/preview/cape2d'

data/lib/mineskin/preview/cape2d.rb

@@ -0,0 +1,31 @@
+require 'rmagick'
+
+module MineSkin
+  module Preview
+    class Cape2D
+      include Unit
+      include Compositor
+
+      def initialize(cape_data)
+        @cape_data = cape_data
+      end
+
+      def render(width, background: 'white')
+        @unit = image_unit size: width, count: 40
+        @image = Magick::Image.new(width, 65 * width / 100) do
+          self.background_color = background
+        end
+        render_cape!
+        @image
+      end
+
+      protected
+
+      def render_cape!
+        composite_texture! @cape_data.cape.front, 5, 5, @cape_data.unit
+        composite_texture! @cape_data.cape.back, 25, 5, @cape_data.unit
+      end
+
+    end
+  end
+end

data/lib/mineskin/preview/skin2d.rb

@@ -0,0 +1,60 @@
+require 'rmagick'
+require 'mineskin/unit'
+require 'mineskin/compositor'
+
+module MineSkin
+  module Preview
+    # 2D preview of skin
+    class Skin2D
+      include Unit
+      include Compositor
+      # Initializes object with skin data
+      # @param [MineSkin::SkinData] skin_data Skin Data
+      def initialize(skin_data)
+        @skin_data = skin_data
+      end
+
+      # Renders preview
+      # @param width Width of preview
+      # @param [String] background Optional background color (default white)
+      # @return [Magick::Image] Preview
+      def render(width, background: 'white')
+        @unit = image_unit size: width, count: 12
+        @image = Magick::Image.new(width, 5 * width / 6) do
+          self.background_color = background
+        end
+        render_head!
+        render_body!
+        render_legs!
+        render_arms!
+        @image
+      end
+
+      protected
+
+      def render_head!
+        composite_texture! @skin_data.head.front, 2, 1, @skin_data.unit
+        composite_texture! @skin_data.head.back, 8, 1, @skin_data.unit
+      end
+
+      def render_body!
+        composite_texture! @skin_data.body.front, 2, 3, @skin_data.unit
+        composite_texture! @skin_data.body.back, 8, 3, @skin_data.unit
+      end
+
+      def render_legs!
+        composite_texture! @skin_data.left_leg.front, 3, 6, @skin_data.unit
+        composite_texture! @skin_data.right_leg.front, 2, 6, @skin_data.unit
+        composite_texture! @skin_data.left_leg.back, 8, 6, @skin_data.unit
+        composite_texture! @skin_data.right_leg.back, 9, 6, @skin_data.unit
+      end
+
+      def render_arms!
+        composite_texture! @skin_data.left_arm.front, 4, 3, @skin_data.unit
+        composite_texture! @skin_data.right_arm.front, 1, 3, @skin_data.unit
+        composite_texture! @skin_data.left_arm.back, 7, 3, @skin_data.unit
+        composite_texture! @skin_data.right_arm.back, 10, 3, @skin_data.unit
+      end
+    end
+  end
+end

data/lib/mineskin/skin_data.rb

@@ -1,14 +1,13 @@
 require 'rmagick'
 require 'mineskin/unit'
+require 'mineskin/types'
+require 'mineskin/extractor'
 
 module MineSkin
-  Cuboid = Struct.new(:top, :bottom, :left, :right, :front, :back)
-  Texture = Struct.new(:texture, :overlay)
-
-  # rubocop:disable ClassLength
   # Skin Data class
   class SkinData
     include Unit
+    include Extractor
 
     attr_accessor(
       :head,
@@ -19,12 +18,13 @@ module MineSkin
       :right_leg
     )
     attr_reader :unit
-
     def new_format?
       @new_format
     end
 
     # rubocop:disable AbcSize
+    # Initializes new instance of SkinData
+    # @param [String] filename Path to input file
     def initialize(filename)
       @image = Magick::Image.read(filename).first
       @new_format = @image.columns == @image.rows
@@ -35,53 +35,8 @@ module MineSkin
       @left_arm, @right_arm = extract_arms
     end
 
-    def crop(texture)
-      @image.crop(
-        texture[:x] * @unit,
-        texture[:y] * @unit,
-        texture[:width] * @unit,
-        texture[:height] * @unit
-      )
-    end
-
-    def part(texture: { x: 0, y: 0, width: 0, height: 0 }, overlay: nil)
-      tex = crop coords_to_h texture
-
-      part = Texture.new(tex, nil)
-      if overlay
-        over = crop coords_to_h overlay
-        part.overlay = over
-      end
-
-      part
-    end
-
-    def extract(hash)
-      Cuboid.new(
-        part(hash[:top]),
-        part(hash[:bottom]),
-        part(hash[:left]),
-        part(hash[:right]),
-        part(hash[:front]),
-        part(hash[:back])
-      )
-    end
-
     protected
 
-    def coords_to_h(c)
-      if c.is_a? Array
-        {
-          x: c[0],
-          y: c[1],
-          width: c[2],
-          height: c[3]
-        }
-      else
-        c
-      end
-    end
-
     def new_only(*x)
       if new_format?
         return x.first if x.first.is_a? Array

data/lib/mineskin/types.rb

@@ -0,0 +1,4 @@
+module MineSkin
+  Cuboid = Struct.new(:top, :bottom, :left, :right, :front, :back)
+  Texture = Struct.new(:texture, :overlay)
+end

data/lib/mineskin/version.rb

@@ -1,3 +1,3 @@
 module MineSkin
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mineskin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stepan Melnikov
@@ -31,9 +31,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mineskin.rb
+- lib/mineskin/cape_data.rb
+- lib/mineskin/compositor.rb
+- lib/mineskin/extractor.rb
 - lib/mineskin/preview.rb
-- lib/mineskin/preview/2d.rb
+- lib/mineskin/preview/cape2d.rb
+- lib/mineskin/preview/skin2d.rb
 - lib/mineskin/skin_data.rb
+- lib/mineskin/types.rb
 - lib/mineskin/unit.rb
 - lib/mineskin/version.rb
 homepage: https://github.com/unn4m3d/mineskin

data/lib/mineskin/preview/2d.rb

@@ -1,66 +0,0 @@
-require 'rmagick'
-require 'mineskin/unit'
-module MineSkin
-  module Preview
-    # 2D preview
-    class Preview2D
-      include Unit
-
-      def initialize(skin_data)
-        @skin_data = skin_data
-      end
-
-      def render(width, background: 'white')
-        @unit = image_unit size: width, count: 12
-        @image = Magick::Image.new(width, 5 * width / 6) do
-          self.background_color = background
-        end
-        render_head!
-        render_body!
-        render_legs!
-        render_arms!
-        @image
-      end
-
-      protected
-
-      def resize(img)
-        img.sample(@unit.to_f / @skin_data.unit.to_f)
-      end
-
-      def composite_texture!(tex, x, y, op: Magick::SrcOverCompositeOp)
-        @image.composite!(resize(tex.texture), x * @unit, y * @unit, op)
-        @image.composite!(
-          resize(tex.overlay),
-          x * @unit,
-          y * @unit,
-          op
-        ) if tex.overlay
-      end
-
-      def render_head!
-        composite_texture! @skin_data.head.front, 2, 1
-        composite_texture! @skin_data.head.back, 8, 1
-      end
-
-      def render_body!
-        composite_texture! @skin_data.body.front, 2, 3
-        composite_texture! @skin_data.body.back, 8, 3
-      end
-
-      def render_legs!
-        composite_texture! @skin_data.left_leg.front, 3, 6
-        composite_texture! @skin_data.right_leg.front, 2, 6
-        composite_texture! @skin_data.left_leg.back, 8, 6
-        composite_texture! @skin_data.right_leg.back, 9, 6
-      end
-
-      def render_arms!
-        composite_texture! @skin_data.left_arm.front, 4, 3
-        composite_texture! @skin_data.right_arm.front, 1, 3
-        composite_texture! @skin_data.left_arm.back, 7, 3
-        composite_texture! @skin_data.right_arm.back, 10, 3
-      end
-    end
-  end
-end