mc_dot_art_maker 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a39ef04ca4a069c931c7207f4789ae5fbeef514
-  data.tar.gz: 246a961f7cd2ff7fb346130b21c1e2cc7a092278
+  metadata.gz: 4ada9f71a0b53191792fa771b9ecb3439d8994a2
+  data.tar.gz: 0e1c14b21b56675f8e13cc47442aa2bc5975d217
 SHA512:
-  metadata.gz: 33cbf8624fad14ed26eb63a5c16379efec16ff558ef1927aada97c0c97a64fb4cd11147d43a81418032a06912c0942fae0a7e8eda67166436741876cca4b82db
-  data.tar.gz: f671ab9d3c9428788515780d2ba3b01d575288bf26f41435942e75a511169c0fd38470fee9108daa820ab82a281c40e23752dd4bbe0a9fcce9c29d68c9fa8640
+  metadata.gz: e3557db8a6ffba7eda172948ca1f1931cd2862ca0d95c8a82d67aee59a2f8acf828f8d64f92b2689d6da809ede0723af938c934946cd8340c81a1dcf414f18ea
+  data.tar.gz: 6c4c01fd6277c184cedd8d8e38f6dc9f207662e1cf9a075eb9ba6a703dd5286a9571d7360adce6994f3fb8ed8c9bb4f1fb57c3d7678a1e0375bb4ed2bb75afee

data/README.md

@@ -1 +1,3 @@
 # MCDotArtMaker
+
+We are creating a Web Service so that you can try this gem easily.

data/example/make_dot_art/make_dot_art.rb

@@ -3,6 +3,8 @@ require_relative '../../lib/mc_dot_art_maker'
 Dir::entries("src").reject{|e| e[0]=='.'}.each do |entry|
   table = MCDotArtMaker::Table.new("src/#{entry}")
   base = entry.split('.').first
+
+  table.resize_to_fit(500,500)
   table.texture_image.write "output/texture/#{base}.png"
   table.mosaic_image.write "output/mosaic/#{base}.png"
   table.write_schematic "output/schematic/#{base}.schematic"

data/lib/mc_dot_art_maker.rb

@@ -4,6 +4,8 @@ require 'nbt_utils'
 require 'color-rgb'
 require 'rmagick'
 
+require File.expand_path('../mc_dot_art_maker/constants.rb', __FILE__)
+require File.expand_path('../mc_dot_art_maker/extern_lib_extension.rb', __FILE__)
 require File.expand_path('../mc_dot_art_maker/block.rb', __FILE__)
 require File.expand_path('../mc_dot_art_maker/block_list.rb', __FILE__)
 require File.expand_path('../mc_dot_art_maker/cell.rb', __FILE__)

data/lib/mc_dot_art_maker/block.rb

@@ -1,25 +1,6 @@
-module Color
-  class RGB
-    def ==(other)
-      @r == other.r && @g == other.g && @b == other.b
-    end
-    def eql?(other)
-      @r.eql?(other.r) && @g.eql?(other.g) && @b.eql?(other.b)
-    end
-    def hash
-      code = 17
-      code = 37*code + @r.hash
-      code = 37*code + @g.hash
-      code = 37*code + @b.hash
-      code
-    end
-  end
-end
-
 module MCDotArtMaker
-  TEXTURE_SIZE = 16
   class Block
-    attr_reader :name,:id,:data,:texture,:color
+    attr_reader :name,:id,:data,:color
     # - name - ブロック名 e.g. :orange_wool
     # - id - id e.g. 35
     # - data - data e.g. 1
@@ -32,12 +13,19 @@ module MCDotArtMaker
       @color = Color::RGB.new(r, g, b)
       @texture = tx.resize(TEXTURE_SIZE,TEXTURE_SIZE)
     end
+    def texture(size=TEXTURE_SIZE)
+      if size != TEXTURE_SIZE
+        @texture.resize(size,size)
+      else
+        @texture
+      end
+    end
     def to_lab
       @color.to_lab
     end
     def to_rmagic_color
       # p "calc color :#{@color.r} #{@color.g} #{@color.b}"
-      Magick::Pixel.new(@color.r*256, @color.g*256, @color.b*256)
+      Magick::Pixel.new(@color.r*257, @color.g*257, @color.b*257)
     end
 
     def hash

data/lib/mc_dot_art_maker/block_list.rb

@@ -316,16 +316,16 @@ module MCDotArtMaker
       #
       # block :redstone_ore, '73', 'redstone_ore.png'
       #
-      # block :snow, '78', 'snow.png'
+          block :snow, '78', 'snow.png'
       block :ice, '79', 'ice.png'
       #
-      # block :clay, '82', 'clay.png'
+          block :clay, '82', 'clay.png'
       #
       # block :jukebox, '84', 'jukebox_top.png'
       #
       # block :pumpkin, '86', 'pumpkin_top.png'
       # block :netherrack, '87', 'netherrack.png'
-      # block :soul_sand, '88', 'soul_sand.png'
+          block :soul_sand, '88', 'soul_sand.png'
       block :glowstone, '89', 'glowstone.png'
       #
       # block :cake_block, '92', 'cake_top.png'
@@ -457,15 +457,15 @@ module MCDotArtMaker
 
     private
     def block(name, id_data_label, filename)
-      # ブロックをリストに入れるためのヘルパーメソッド
-      image = Magick::ImageList.new(File.expand_path("../textures/#{filename}", __FILE__))
-      r,g,b = MCDotArtMaker.calc_average_color(image.get_pixels(0,0,image.columns,image.rows))
+      # Add blocks to @blocks
+      image = Magick::ImageList.new(File.expand_path("../textures/#{filename}", __FILE__)).first
+      r,g,b = MCDotArtMaker.calc_average_color(image)
       id = id_data_label.split(':')[0].to_i
       data = id_data_label.split(':')[1].to_i
 
-      block = Block.new(name,id, data,r,g,b, image[0])
+      block = Block.new(name,id, data,r,g,b, image)
       @blocks << block
-      puts "Block #{name} registered. R:#{r} G:#{g} B:#{b}"
+      MCDotArtMaker.puts "Block #{name} registered. R:#{r} G:#{g} B:#{b}"
     end
   end
 end

data/lib/mc_dot_art_maker/cell.rb

@@ -5,21 +5,21 @@ module MCDotArtMaker
     attr_accessor :block
     def initialize(image,x,y)
       pixel = image.pixel_color(x,y)
-      r = pixel.red / 256
-      g = pixel.green / 256
-      b = pixel.blue / 256
+      r = pixel.red / 257
+      g = pixel.green / 257
+      b = pixel.blue / 257
       @color = Color::RGB.new(r, g, b)
     end
     # def set_color(r,g,b)
     #   @color = Color::RGB.new(r, g, b)
     #   # p "set color #{r} #{g} #{b}"
     # end
-    def to_lab
-      @color.to_lab
-    end
+    # def to_lab
+    #   @color.to_lab
+    # end
     def to_rmagic_color
       # p "calc color :#{@color.r} #{@color.g} #{@color.b}"
-      Magick::Pixel.new(@color.r*256, @color.g*256, @color.b*256)
+      Magick::Pixel.new(@color.r*257, @color.g*257, @color.b*257)
     end
     def comparitor
       Color::Comparison.new(@color)

data/lib/mc_dot_art_maker/constants.rb

@@ -0,0 +1,14 @@
+#
+# Constants used in this gem
+#
+
+module MCDotArtMaker
+  DEFAULT_DOT_SIZE = 5
+  TEXTURE_SIZE = 16
+
+  DEBUG = false
+
+  NoDitherMethod = Magick::NoDitherMethod
+  RiemersmaDitherMethod = Magick::RiemersmaDitherMethod
+  FloydSteinbergDitherMethod = Magick::FloydSteinbergDitherMethod
+end

data/lib/mc_dot_art_maker/extern_lib_extension.rb

@@ -0,0 +1,52 @@
+#
+# Add some features to extern gem.
+#
+
+module Color
+  class RGB
+    # Add to check equality
+    def ==(other)
+      @r == other.r && @g == other.g && @b == other.b
+    end
+    # Add to use this object for hash key
+    def eql?(other)
+      @r.eql?(other.r) && @g.eql?(other.g) && @b.eql?(other.b)
+    end
+    def hash
+      code = 17
+      code = 37*code + @r.hash
+      code = 37*code + @g.hash
+      code = 37*code + @b.hash
+      code
+    end
+  end
+end
+
+# Add to rewrite NBT files
+module NBTUtils
+  module Tag
+    class ByteArray
+      def payload=(new_value)
+        @payload = ::BinData::String.new(new_value)
+      end
+    end
+  end
+end
+module NBTUtils
+  module Tag
+    class Int
+      def payload=(new_value)
+        @payload = ::BinData::Int32be.new(new_value)
+      end
+    end
+  end
+end
+module NBTUtils
+  module Tag
+    class Short
+      def payload=(new_value)
+        @payload = ::BinData::Int16be.new(new_value)
+      end
+    end
+  end
+end

data/lib/mc_dot_art_maker/schematic_helper.rb

@@ -1,32 +1,3 @@
-# NBTUtilsを開いてデータ書き換えのためのメソッドを定義する
-module NBTUtils
-  module Tag
-    class ByteArray
-      def payload=(new_value)
-        @payload = ::BinData::String.new(new_value)
-      end
-    end
-  end
-end
-module NBTUtils
-  module Tag
-    class Int
-      def payload=(new_value)
-        @payload = ::BinData::Int32be.new(new_value)
-      end
-    end
-  end
-end
-module NBTUtils
-  module Tag
-    class Short
-      def payload=(new_value)
-        @payload = ::BinData::Int16be.new(new_value)
-      end
-    end
-  end
-end
-
 module MCDotArtMaker
   class IllegalBlockSizeError < StandardError ; end
 

data/lib/mc_dot_art_maker/table.rb

@@ -1,53 +1,36 @@
 module MCDotArtMaker
-  DEFAULT_DOT_SIZE = 5
   #= ドット絵を表すクラス。Cellの集合体
   class Table
     attr_reader :width, :height, :cells
-    include Enumerable
+    # include Enumerable
 
-    def initialize(filename,dither_method = Magick::RiemersmaDitherMethod)
+    def initialize(filename,dither_method = RiemersmaDitherMethod)
       # モザイクにしたい元画像をセット
-
       if filename.instance_of? String
         @image = Magick::ImageList.new(filename).first
       elsif filename.instance_of? Magick::Image
         @image = filename
       end
-
-        
-      # - width - 絵の横方向の大きさ
-      # - height - 絵の縦方向の大きさ
-      # 端っこは切り捨てる
-      @width = @image.columns
-      @height = @image.rows
-      @cells = []
-      @block_list = MCDotArtMaker::BlockList.instance
-
-      puts "remapping..."
-      @image = @image.remap(@block_list.to_remap_image,dither_method)
-      puts "Done!"
-
-      puts "Registering cells..."
-      (@width*@height).times do |i|
-        x = i % @width #列番号・横方向: x
-        y = i / @width #行番号・縦方向: y
-        @cells << Cell.new(@image,x,y)
-      end
-      puts "Done!"
-
+      @dither_method = dither_method
 
       @schematic_helper = MCDotArtMaker::SchematicHelper.instance
       @schematic_helper.read File.expand_path('../seed.schematic', __FILE__)
 
       @calculation_count = 0 # 近似ブロック計算が終わったらインクリメント
     end
+    def resize_to_fit(width, height)
+      @image = @image.resize_to_fit(width, height)
+    end
     def [](row,col)
+      load_image unless image_loaded?
       @cells[row*@width + col]
     end
     def []=(row,col,newValue)
+      load_image unless image_loaded?
       @cells[row*@width + col] = newValue
     end
     def each(size = 1)
+      load_image unless image_loaded?
       @cells.each_with_index do |c,i|
         x = (i % @width) * size #列番号・横方向: x
         y = (i/@width) * size #行番号・縦方向: y
@@ -56,6 +39,7 @@ module MCDotArtMaker
       end
     end
     def each_with_index(size = 1)
+      load_image unless image_loaded?
       @cells.each_with_index do |c,i|
         x = (i % @width) * size #列番号・横方向: x
         y = (i/@width) * size #行番号・縦方向: y
@@ -64,6 +48,7 @@ module MCDotArtMaker
       end
     end
     def block_ids
+      load_image unless image_loaded?
       tmp = []
       each do |c|
         tmp << c.block.id
@@ -71,42 +56,44 @@ module MCDotArtMaker
       tmp
     end
     def block_data
+      load_image unless image_loaded?
       tmp = []
       each do |c|
         tmp << c.block.data
       end
       tmp
     end
-    def mosaic_image
+    def mosaic_image(size = 1)
       # モザイク化した画像を返す
       calculate
 
-      new_image = Magick::Image.new(@width*TEXTURE_SIZE, @height*TEXTURE_SIZE){ self.background_color = "white" }
-      each(TEXTURE_SIZE) do |c,x,y|
+      new_image = Magick::Image.new(@width*size, @height*size){ self.background_color = "white" }
+      each(size) do |c,x,y|
         idr = Magick::Draw.new
         idr.fill = c.block.to_rmagic_color
-        idr.rectangle(x, y, x + TEXTURE_SIZE, y + TEXTURE_SIZE)
+        idr.rectangle(x, y, x + size, y + size)
         idr.draw(new_image)
       end
       new_image
     end
     def calculate
+      load_image unless image_loaded?
       calc_nearest_block unless calculation_done?
     end
 
-    def texture_image
+    def texture_image(size = TEXTURE_SIZE)
       # 近似ブロック色でのモザイク画像を返す
       calculate
 
-      new_image = Magick::Image.new(@width*TEXTURE_SIZE, @height*TEXTURE_SIZE){ self.background_color = "white" }
-      each(TEXTURE_SIZE) do |c,x,y|
-        new_image.composite!(c.block.texture, x, y, Magick::OverCompositeOp)
+      new_image = Magick::Image.new(@width*size, @height*size){ self.background_color = "white" }
+      each(size) do |c,x,y|
+        new_image.composite!(c.block.texture(size), x, y, Magick::OverCompositeOp)
       end
       new_image
     end
 
     def write_schematic(filename)
-      calc_nearest_block unless calculation_done?
+      calculate
 
       @schematic_helper.blocks = block_ids
       @schematic_helper.data = block_data
@@ -121,14 +108,16 @@ module MCDotArtMaker
       @schematic_helper.length  = @height
       @schematic_helper.write filename
     end
-
+    def image_loaded?
+      !@cells.nil?
+    end
     private
     def calc_nearest_block
-      puts "Calc nearest block...."
+      MCDotArtMaker.puts "Calc nearest block...."
       @nearest_color_cash ||= {}
 
       each_with_index do |cell,index|
-        puts "Calculating #{index+1} of #{@cells.size}" if (index % 10000 == 0)|| (index == @cells.size)
+        puts "Calculating #{index+1} of #{@cells.size}" if ((index+1) % 10000 == 0)|| (index+1 == @cells.size)
         if @nearest_color_cash.include?(cell.color)
           cell.block = @nearest_color_cash[cell.color]
         else
@@ -141,14 +130,38 @@ module MCDotArtMaker
           @nearest_color_cash[cell.color] = nearest_block
           cell.block = nearest_block
 
-          puts "Cashed new color #{@nearest_color_cash.size} of #{@block_list.size}"
+          MCDotArtMaker.puts "Cashed new color #{@nearest_color_cash.size} of #{@block_list.size}"
         end
         @calculation_count += 1
       end
-      puts "Done!"
+      MCDotArtMaker.puts "Done!"
     end
     def calculation_done?
       @cells.size == @calculation_count
     end
+    def load_image
+      # - width - 絵の横方向の大きさ
+      # - height - 絵の縦方向の大きさ
+      # 端っこは切り捨てる
+      @width = @image.columns
+      @height = @image.rows
+      @cells = []
+      @block_list = MCDotArtMaker::BlockList.instance
+
+      MCDotArtMaker.puts "remapping..."
+      @image = @image.remap(@block_list.to_remap_image,@dither_method)
+      MCDotArtMaker.puts "Done!"
+
+      MCDotArtMaker.puts "Registering cells..."
+      (@width*@height).times do |i|
+        x = i % @width #列番号・横方向: x
+        y = i / @width #行番号・縦方向: y
+        @cells << Cell.new(@image,x,y)
+      end
+      MCDotArtMaker.puts "Done!"
+
+      @calculation_count = 0
+    end
+
   end
 end

data/lib/mc_dot_art_maker/utils.rb

@@ -1,23 +1,34 @@
 module MCDotArtMaker
-  def self.calc_average_color(pixels)
+  def self.calc_average_color(arg)
+    pixels = nil
+    if arg.instance_of? Magick::Image or arg.instance_of? Magick::ImageList
+      pixels = arg.get_pixels(0,0,arg.columns,arg.rows)
+    elsif arg.instance_of? Array
+      pixels = arg
+    end
+
     if pixels.size == 1
-      return pixels[0].red/256, pixels[0].green/256, pixels[0].blue/256
+      return pixels[0].red/257, pixels[0].green/257, pixels[0].blue/257
     end
     sum_r = pixels.reduce(0) do |a,elem|
-      a+elem.red/256
+      a+elem.red/257
     end
     ave_r = sum_r/pixels.size
 
     sum_g = pixels.reduce(0) do |a,elem|
-      a+elem.green/256
+      a+elem.green/257
     end
     ave_g = sum_g/pixels.size
 
     sum_b = pixels.reduce(0) do |a,elem|
-      a+elem.blue/256
+      a+elem.blue/257
     end
     ave_b = sum_b/pixels.size
 
     [ave_r, ave_g, ave_b]
   end
+
+  def self.puts(*args)
+    Kernel.puts *args if DEBUG
+  end
 end

data/mc_dot_art_maker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = 'mc_dot_art_maker'
-	s.version = '0.1.4'
+	s.version = '0.2.0'
 	s.licenses = ['MIT']
 	s.summary = 'Dot Art Maker for Minecraft'
 	s.description = 'Converting images to mosaic arts using Minecraft textures and .schematic files.'

data/test/test_dither_method.rb

@@ -1,7 +1,7 @@
 require_relative '../lib/mc_dot_art_maker'
 
 
-methods = [Magick::NoDitherMethod,Magick::RiemersmaDitherMethod,Magick::FloydSteinbergDitherMethod]
+methods = [MCDotArtMaker::NoDitherMethod,MCDotArtMaker::RiemersmaDitherMethod,MCDotArtMaker::FloydSteinbergDitherMethod]
 
 methods.each do |m|
   fn = Magick::ImageList.new("test_image.jpg").first

data/test/test_mosaic.rb

@@ -0,0 +1,6 @@
+require_relative '../lib/mc_dot_art_maker'
+
+table = MCDotArtMaker::Table.new("test_image.jpg")
+table.resize_to_fit(50,50)
+table.texture_image.write "test_image_texture.png"
+table.mosaic_image.write "test_image_mosaic.png"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mc_dot_art_maker
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Kumassy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -130,6 +130,8 @@ files:
 - lib/mc_dot_art_maker/block.rb
 - lib/mc_dot_art_maker/block_list.rb
 - lib/mc_dot_art_maker/cell.rb
+- lib/mc_dot_art_maker/constants.rb
+- lib/mc_dot_art_maker/extern_lib_extension.rb
 - lib/mc_dot_art_maker/schematic_helper.rb
 - lib/mc_dot_art_maker/seed.schematic
 - lib/mc_dot_art_maker/table.rb
@@ -524,6 +526,9 @@ files:
 - test/test_image_FloydSteinbergDitherMethod.png
 - test/test_image_NoDitherMethod.png
 - test/test_image_RiemersmaDitherMethod.png
+- test/test_image_mosaic.png
+- test/test_image_texture.png
+- test/test_mosaic.rb
 homepage: https://github.com/Kumassy/MCDotArtMaker
 licenses:
 - MIT