mc_dot_art_maker 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8bba8b3c0dd213bbc1373c7855a5e3e5d525ce
-  data.tar.gz: 1e9ef111cc8d79258a25cc2b3150b2008ab8fc69
+  metadata.gz: 5c5eadce9ad342558d5269970693f1f110fbf5fe
+  data.tar.gz: 96bd5ac60f276ab5cacc97501336843cea8ccfff
 SHA512:
-  metadata.gz: b156b06c04153393b1538c8c333914112df2a3e27519d03a6a308212ae238b35054f276384ef44dea3900bad695cc09b8022deb0f91ed6e923dec4cc9008f733
-  data.tar.gz: 07e1adbf5b2a86e918f281528f0a188e53f9ce04de02349a4a6de90d7c90b7f6fddd96dc2dc24577aa17a1ebfeca5e460614695efa87cf595e271760be2c4f12
+  metadata.gz: 2e67e267ef5c97ee58c460f244a92f1abab1cc7abe26db8a9360d8b460de99ea9f987fe9be4ce38aae029eb9502094f961510fa96b27bc073402ff4472032693
+  data.tar.gz: c6a614fcd8e5f364657d5d5c0e15e668859857e4a8dadcfdfc7c8b7e10ae70367432a40d9b8a805c84cdbd48b02fb927eeffbf36c431ee1ebbcbc16afea69ff5

data/Gemfile

@@ -3,4 +3,5 @@ gem 'color-rgb'
 gem 'rmagick'
 gem 'nbt_utils'
 gem 'rspec'
+gem 'zip'
 # gem 'parallel'

data/bin/mc-dam

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+require 'optparse'
+require 'mc_dot_art_maker'
+
+
+module MCDotArtMaker
+  input = nil
+  type = nil
+  filename = nil
+
+  OptionParser.new do |opt|
+    opt.banner = "Usage: mc-dam <input> [options]"
+    opt.separator "options are:"
+    opt.on('-h', '--help', "Show help") do
+      puts opt
+      exit
+    end
+    opt.on('-t type', "Type to convert [normal | texture | schematic]") do |v|
+      type = v
+
+      unless ["normal", "texture", "schematic"].include? type
+        puts "Invalid type"
+        exit
+      end
+    end
+    opt.on('-o output', "Write output to <file>") do |v|
+      filename = v
+      if filename.nil? || filename == ""
+        puts "Invalid filename"
+        exit
+      end
+    end
+    opt.on('-i input', "Input image") do |v|
+      input = v
+      if input.nil? || input == ""
+        puts "Invalid filename"
+        exit
+      end
+    end
+    opt.parse!(ARGV)
+  end
+
+
+  maker = Maker.new(input)
+  maker.resize_to_limit(500,500)
+
+  case type
+  when "normal"
+    maker.mosaic_image.write "#{filename}.png"
+  when "texture"
+    maker.texture_image.write "#{filename}.png"
+  when "schematic"
+    maker.write_schematic "#{filename}.schematic"
+  end
+end

data/example/make_dot_art/make_dot_art.rb

@@ -14,7 +14,7 @@ Dir::entries("src").reject{|e| e[0]=='.'}.each do |entry|
   maker = MCDotArtMaker::Maker.new("src/#{entry}")
   base = entry.split('.').first
 
-  maker.resize_to_fit(500,500)
+  maker.resize_to_limit(500,500)
   maker.texture_image.write "output/texture/#{base}.png"
   maker.mosaic_image.write "output/mosaic/#{base}.png"
   maker.write_schematic "output/schematic/#{base}.schematic"

data/lib/mc_dot_art_maker/block_list.rb

@@ -6,8 +6,6 @@ module MCDotArtMaker
       @loader = MCDotArtMaker::TextureLoader.new(jar_path)
       @blocks = []
 
-      # できるだけ多くのブロックを使ったバージョン
-
       # block :stone, '1', 'stone.png'
       # block :granite, '1:1', 'stone_granite.png'
       # block :polished_granite, '1:2', 'stone_granite_smooth.png'
@@ -16,7 +14,7 @@ module MCDotArtMaker
       # block :andesite, '1:5', 'stone_andesite.png'
       # block :polished_andesite, '1:6', 'stone_andesite_smooth.png'
       # # block :grass, '2', ''
-      # # テクスチャがグレースケールでたぶんバイオームごとに色を変えてる
+      # @note texture color may chanege dependingon biomes.
       # block :dirt, '3', 'dirt.png'
       # block :coarse_dirt, '3:1', 'coarse_dirt.png'
       # block :podzol, '3:2', 'dirt_podzol_top.png'
@@ -36,7 +34,8 @@ module MCDotArtMaker
       # block :gold_ore, '14', 'gold_ore.png'
       # block :iron_ore, '15', 'iron_ore.png'
       # block :coal_ore, '16', 'coal_ore.png'
-      # block :oak_wood, '17', 'log_oak_top.png' # TODO: テクスチャ注意
+      # @note take notice of texture
+      # block :oak_wood, '17', 'log_oak_top.png'
       # # block :spruce_wood, '17:1', 'spruce_wood.png'
       # # block :birch_wood, '17:2', 'birch_wood.png'
       # # block :jungle_wood, '17:3', 'jungle_wood.png'
@@ -45,7 +44,7 @@ module MCDotArtMaker
       # # block :spruce_leaves, '18:1', 'spruce_leaves.png'
       # # block :birch_leaves, '18:2', 'birch_leaves.png'
       # # block :jungle_leaves, '18:3', 'jungle_leaves.png'
-      # # テクスチャがグレースケールでたぶんバイオームごとに色を変えてる
+      # @note texture color may chanege dependingon biomes.
       # block :sponge, '19', 'sponge.png'
       # block :wet_sponge, '19:1', 'sponge_wet.png'
       # block :glass, '20', 'glass.png'
@@ -213,11 +212,11 @@ module MCDotArtMaker
       # block :slime_block, '165', 'slime.png'
       #
       # # block :prismarine, '168', 'prismarine.png'
-      # # TODO: 複数フレームでアニメーションあり
+      # @note this texture may be animated
       # block :prismarine_bricks, '168:1', 'prismarine_bricks.png'
       # block :dark_prismarine, '168:2', 'prismarine_dark.png'
       # # block :sea_lantern, '169', 'sea_lantern.png'
-      # # TODO: 複数フレームでアニメーションあり
+      # @note this texture may be animated
       # block :hay_bale, '170', 'hay_block_top.png'
       #
       # block :hardened_clay, '172', 'hardened_clay.png'
@@ -231,8 +230,7 @@ module MCDotArtMaker
 
 
 
-      # http://imgur.com/a/MTv0r
-      # このカラーパレットを採用したバージョン
+      # @note used this color pallete: http://imgur.com/a/MTv0r
       # block :stone, '1', 'stone.png'
       # block :granite, '1:1', 'stone_granite.png'
       # block :polished_granite, '1:2', 'stone_granite_smooth.png'
@@ -260,7 +258,8 @@ module MCDotArtMaker
       # block :gold_ore, '14', 'gold_ore.png'
       # block :iron_ore, '15', 'iron_ore.png'
       # block :coal_ore, '16', 'coal_ore.png'
-      # block :oak_wood, '17', 'log_oak_top.png' # TODO: テクスチャ注意
+      # @note take notice of texture
+      # block :oak_wood, '17', 'log_oak_top.png'
       block :sponge, '19', 'sponge.png'
       # block :wet_sponge, '19:1', 'sponge_wet.png'
       # block :glass, '20', 'glass.png'
@@ -431,11 +430,13 @@ module MCDotArtMaker
       # block :smooth_red_sandstone, '179:2', 'red_sandstone_smooth.png'
 
     end
+    # @param [MCDotArtMaker::Block]
     def add(b)
       @blocks << b
     end
     alias_method  :<<,:add
 
+    # @return [Fixnum] size of block list
     def size
       @blocks.size
     end
@@ -447,6 +448,7 @@ module MCDotArtMaker
       end
     end
 
+    # @return [Magick::Image] color palette of block list for remapping input image
     def color_palette
       # Make color palette
       new_image = Magick::Image.new(@blocks.size,1){ self.background_color = "white" }

data/lib/mc_dot_art_maker/maker.rb

@@ -36,6 +36,16 @@ module MCDotArtMaker
       raise(ArgumentError, "Should return Magick::Image object") unless image.class == Magick::Image
       @image = image
     end
+    def resize_to_limit(width, height)
+      manipulate do |img|
+        geometry = Magick::Geometry.new(width, height, 0, 0, Magick::GreaterGeometry)
+        new_img = img.change_geometry(geometry) do |new_width, new_height|
+          img.resize(new_width, new_height)
+        end
+        img.destroy!
+        new_img
+      end
+    end
 
     def calculate
       # load_image unless image_loaded?

data/lib/mc_dot_art_maker/texture_loader.rb

@@ -30,7 +30,7 @@ module MCDotArtMaker
         jar_file_path = File.join(TEXTURE_TMP_DIR,jar_basename)
         FileUtils.cp(@jar,jar_file_path) if Dir.glob(File.join(TEXTURE_TMP_DIR,'*.jar')).empty?
 
-        Zip::File.open(jar_file_path) do |zip|
+        Zip::ZipFile.open(jar_file_path) do |zip|
           zip.each do |entry|
             if md = /\Aassets\/minecraft\/textures\/blocks\/#{filename}\Z/.match(entry.to_s)
               entry.extract(File.join(TEXTURE_DIR, filename))

data/mc_dot_art_maker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = 'mc_dot_art_maker'
-	s.version = '0.4.1'
+	s.version = '0.5.0'
 	s.licenses = ['MIT']
 	s.summary = 'Dot Art Maker for Minecraft'
 	s.description = 'Converting images to mosaic arts using Minecraft textures and .schematic files.'
@@ -8,12 +8,17 @@ Gem::Specification.new do |s|
 	s.files = `git ls-files -z`.split("\x0")
 	s.homepage = 'https://github.com/Kumassy/MCDotArtMaker'
 
+	s.executables   = ["mc-dam"]
+	s.require_paths = ["lib"]
+
 	s.required_ruby_version = '>= 2.1.0'
 
+	s.add_runtime_dependency 'zip'
+	s.add_runtime_dependency 'nbt_utils'
+	s.add_runtime_dependency 'color-rgb'
+	s.add_runtime_dependency 'rmagick'
+
 	s.add_development_dependency 'bindata'
-	s.add_development_dependency 'color-rgb'
-	s.add_development_dependency 'nbt_utils'
-	s.add_development_dependency 'rmagick'
 	s.add_development_dependency "bundler", "~> 1.11"
 	s.add_development_dependency "rake", "~> 10.0"
 	s.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: mc_dot_art_maker
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Kumassy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bindata
+  name: zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,13 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: color-rgb
+  name: nbt_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nbt_utils
+  name: color-rgb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -54,6 +54,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bindata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,7 +125,8 @@ dependencies:
 description: Converting images to mosaic arts using Minecraft textures and .schematic
   files.
 email: 
-executables: []
+executables:
+- mc-dam
 extensions: []
 extra_rdoc_files: []
 files:
@@ -121,12 +136,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/mc-dam
 - deprecated/lib/mc_dot_art_maker/cell.rb
 - deprecated/lib/mc_dot_art_maker/table.rb
 - example/make_dot_art/make_dot_art.rb
+- example/make_dot_art/output/mosaic/conoha_stamp__original.png
 - example/make_dot_art/output/mosaic/test_image.png
 - example/make_dot_art/output/schematic/test_image.schematic
+- example/make_dot_art/output/texture/conoha_stamp__original.png
 - example/make_dot_art/output/texture/test_image.png
+- example/make_dot_art/src/conoha_stamp__original.jpg
 - example/make_dot_art/src/test_image.jpg
 - lib/mc_dot_art_maker.rb
 - lib/mc_dot_art_maker/block.rb
@@ -180,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Dot Art Maker for Minecraft