mc_dot_art_maker 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29209338abdd7386e898607c46898dd765a38b38
-  data.tar.gz: 0eb73d7e9430fc8409baafcb98439dd5bfd911b8
+  metadata.gz: 144001b6a79d4c4e769f79d4945856ba6378316d
+  data.tar.gz: fa4e456ade60eadeaafa495078341cad8c1dba22
 SHA512:
-  metadata.gz: 732f0c6f2af76cdfd3623d659610a5d700c1a48d9fcd455306b69eac12256f9e4eda5729fe48ff5a070e298b8a5c8ef7b0bcffad774a22bb441c81bddbe68ccc
-  data.tar.gz: b926da55c0212274c490f0a932e8292f54eacc1381dcc57158d117a30f2e596f5b1bbd1018fa04ca13e0dad3ed139d7a217bb94ca33211f028ebb7c872fa23ca
+  metadata.gz: de51d06a5c62a7dda4b4c086bbefb0ed1eb88aa08575e31d44e13129c6cdf309825f8ff167278c951952e17d071ccdc7ed30d57d37ac8a7851e7f1a74ab9cc19
+  data.tar.gz: fdc48d92deb4ab917cdbb8ebc71d1f5535424e87c3ca4d2f9595f62618ee5d9319aa3e1e0aec6470d64b8f6439ee3cff3ada893a2cd61279a3014f14bd2b8568

data/.gitignore

@@ -10,7 +10,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
-
+/lib/mc_dot_art_maker/textures/
 
 
 

data/Rakefile

@@ -1,6 +1,13 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'rake/testtask'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
+end

data/lib/mc_dot_art_maker/block.rb

@@ -21,21 +21,18 @@ module MCDotArtMaker
         @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*257, @color.g*257, @color.b*257)
     end
 
     def hash
       code = 17
-      code = 37*code + @name.hash
-      code = 37*code + @id.hash
-      code = 37*code + @data.hash
-      code = 37*code + @texture.hash
-      code = 37*code + @color.hash
+      code = 37 * code + @name.hash
+      code = 37 * code + @id.hash
+      code = 37 * code + @data.hash
+      code = 37 * code + @texture.hash
+      code = 37 * code + @color.hash
       code
     end
     def eql?(other)

data/lib/mc_dot_art_maker/block_list.rb

@@ -471,8 +471,8 @@ module MCDotArtMaker
       MCDotArtMaker.puts "Block #{name} registered: #{color}"
     end
 
-    def calc_average_color(arg)
-      pixels = arg.get_pixels(0,0,arg.columns,arg.rows)
+    def calc_average_color(image)
+      pixels = image.get_pixels(0,0,image.columns,image.rows)
 
       sum_r = pixels.reduce(0) do |a,elem|
         a+elem.red/257

data/lib/mc_dot_art_maker/dot.rb

@@ -1,30 +1,63 @@
 module MCDotArtMaker
+  class InternalError < StandardError; end
   class Dot
-    attr_reader :color
+    attr_reader :color, :x, :y
     attr_accessor :block
-    def initialize(image,x,y)
-      pixel = image.pixel_color(x,y)
-      r = pixel.red / 257
-      g = pixel.green / 257
-      b = pixel.blue / 257
-      @color = Color::RGB.new(r, g, b)
+
+    def initialize(color, x, y)
+      @color = color
+      @x = x
+      @y = y
     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_rmagic_color
       # p "calc color :#{@color.r} #{@color.g} #{@color.b}"
       Magick::Pixel.new(@color.r*257, @color.g*257, @color.b*257)
     end
-    def comparitor
-      Color::Comparison.new(@color)
+
+    # def determine_block(block_list)
+    def determine_block
+      # comparitor = self.comparitor
+      # block_distance_list = {}
+      # block_list.each do |block|
+      #   block_distance_list[block] = comparitor.compare(block.color)
+      # end
+      # nearest_block = block_distance_list.min{ |x, y| x[1] <=> y[1] }[0]  #[0]: key   [1]: value
+      #
+      # self.block = nearest_block
+      # nearest_block
+
+
+      # clocest_block = block_list.select{ |block|
+      #   comparitor.compare(block.color) == 0
+      # }.first
+      # raise(InternalError, "An error occured while determine clocest block...") if clocest_block.nil?
+      #
+      # @block = clocest_block
+
+
+      @block = self.class.color_block_table[@color]
     end
-    # def image=(other)
-    #   @image = other.resize(16,16)
+
+    private
+    # def comparitor
+    #   @comparitor || begin
+    #     @comparitor = Color::Comparison.new(@color)
+    #   end
     # end
+
+    class << self
+      def set_color_palette(cp)
+        @block_list = cp
+
+        @color_block_table = @block_list.reduce({}) do |hash, block|
+          hash.store(block.color,block)
+          hash
+        end
+      end
+      def color_block_table
+        @color_block_table
+      end
+    end
   end
 end

data/lib/mc_dot_art_maker/extern_lib_extension.rb

@@ -1,6 +1,17 @@
 #
 # Add some features to extern gem.
 #
+module Magick
+  class Image
+    def get_color_rgb_at(x, y)
+      pixel = self.pixel_color(x,y)
+      r = pixel.red / 257
+      g = pixel.green / 257
+      b = pixel.blue / 257
+      ::Color::RGB.new(r, g, b)
+    end
+  end
+end
 
 module Color
   class RGB

data/lib/mc_dot_art_maker/maker.rb

@@ -1,105 +1,74 @@
 module MCDotArtMaker
+  class CannotModifyImageError < StandardError; end
+
   class Maker
-    attr_reader :width, :height, :cells, :image
-    # include Enumerable
-
-    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
+    attr_reader :width, :height, :dots, :image
+
+    def initialize(filename_or_image,dither_method = RiemersmaDitherMethod)
+      @image =
+        case filename_or_image
+        when String
+          Magick::ImageList.new(filename_or_image).first
+        when Magick::Image
+          filename_or_image
+        end
       @dither_method = dither_method
 
-      @schematic_helper = MCDotArtMaker::SchematicHelper.instance
-      @schematic_helper.read File.expand_path('../seed.schematic', __FILE__)
+      @schematic_helper = MCDotArtMaker::SchematicHelper.new
+      @schematic_helper.read(File.expand_path('../seed.schematic', __FILE__))
       @block_list = MCDotArtMaker::BlockList.instance
 
       @calculation_count = 0 # 近似ブロック計算が終わったらインクリメント
-    end
-    def resize_to_fit(width, height)
-      @image = @image.resize_to_fit(width, height)
+      @is_locked = false
 
-      # reset
-      @cells = nil
+      MCDotArtMaker::Dot.set_color_palette(@block_list)
     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
-        yield c,x,y
-        # cell,cellの左上のx座標 ,cellの左上のy座標
-      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
-        yield c,i,x,y
-        # cell,cellの左上のx座標 ,cellの左上のy座標
-      end
-    end
-    def block_ids
-      load_image unless image_loaded?
-      tmp = []
-      each do |c|
-        tmp << c.block.id
-      end
-      tmp
+    # def resize_to_fit(width, height)
+    #   check_not_locked
+    #   # @image = @image.resize_to_fit(width, height)
+    #   @image.resize_to_fit!(width, height)
+    # end
+
+    def manipulate
+      check_not_locked
+      image = yield @image
+      raise(ArgumentError,"Should return Magick::Image object") unless image.class == Magick::Image
+      @image = image
     end
-    def block_data
-      load_image unless image_loaded?
-      tmp = []
-      each do |c|
-        tmp << c.block.data
-      end
-      tmp
+
+    def calculate
+      # load_image unless image_loaded?
+      load_image unless image_locked?
+      calc_nearest_block unless calculation_done?
+      lock_image
     end
+
     def mosaic_image(size = 1)
       # モザイク化した画像を返す
-      calculate
+      # calculate
 
       new_image = Magick::Image.new(@width*size, @height*size){ self.background_color = "white" }
-      each(size) do |c,x,y|
+
+      @dots.each do |c|
         idr = Magick::Draw.new
         idr.fill = c.block.to_rmagic_color
-        idr.rectangle(x, y, x + size, y + size)
+        idr.rectangle(c.x, c.y, c.x + size, c.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 reset
-      load_image
-    end
-
     def texture_image(size = TEXTURE_SIZE)
       # 近似ブロック色でのモザイク画像を返す
-      calculate
+      # calculate
 
       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)
+      @dots.each do |c|
+        new_image.composite!(c.block.texture(size), c.x*size, c.y*size, Magick::OverCompositeOp)
       end
       new_image
     end
-
     def write_schematic(filename)
-      calculate
+      # calculate
 
       @schematic_helper.blocks = block_ids
       @schematic_helper.data = block_data
@@ -117,31 +86,35 @@ module MCDotArtMaker
 
     private
     def calc_nearest_block
+      # MCDotArtMaker.puts "Calc nearest block...."
+      # @nearest_color_cache ||= {}
+      #
+      # @dots.each_with_index do |cell,index|
+      #   puts "Calculating #{index+1} of #{@dots.size}" if ((index+1) % 10000 == 0)|| (index+1 == @dots.size)
+      #   if @nearest_color_cache.include?(cell.color)
+      #     cell.block = @nearest_color_cache[cell.color]
+      #   else
+      #     @nearest_color_cache[cell.color] = cell.determine_block(@block_list)
+      #
+      #     MCDotArtMaker.puts "Cashed new color #{@nearest_color_cache.size} of #{@block_list.size}"
+      #   end
+      #   @calculation_count += 1
+      # end
+      # MCDotArtMaker.puts "Done!"
+
+
+
       MCDotArtMaker.puts "Calc nearest block...."
-      @nearest_color_cash ||= {}
-
-      each_with_index do |cell,index|
-        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
-          comparitor = cell.comparitor
-          block_distance_list = {}
-          @block_list.each do |block|
-            block_distance_list[block] = comparitor.compare(block.color)
-          end
-          nearest_block = block_distance_list.min{ |x, y| x[1] <=> y[1] }[0]  #[0]: key   [1]: value
-          @nearest_color_cash[cell.color] = nearest_block
-          cell.block = nearest_block
 
-          MCDotArtMaker.puts "Cashed new color #{@nearest_color_cash.size} of #{@block_list.size}"
-        end
+      @dots.each_with_index do |dot,index|
+        puts "Calculating #{index+1} of #{@dots.size}" if ((index+1) % 10000 == 0)|| (index+1 == @dots.size)
+        dot.determine_block
         @calculation_count += 1
       end
       MCDotArtMaker.puts "Done!"
     end
     def calculation_done?
-      @cells.size == @calculation_count
+      @dots.size == @calculation_count
     end
     def load_image
       # - width - 絵の横方向の大きさ
@@ -149,26 +122,74 @@ module MCDotArtMaker
       # 端っこは切り捨てる
       @width = @image.columns
       @height = @image.rows
-      @cells = []
+      @dots = []
 
 
       MCDotArtMaker.puts "remapping..."
       @image = @image.remap(@block_list.color_palette,@dither_method)
       MCDotArtMaker.puts "Done!"
 
-      MCDotArtMaker.puts "Registering cells..."
+      MCDotArtMaker.puts "Registering dots..."
       (@width*@height).times do |i|
         x = i % @width #列番号・横方向: x
         y = i / @width #行番号・縦方向: y
-        # @cells << Cell.new(@image,x,y)
-        @cells << Dot.new(@image,x,y)
+        @dots << Dot.new(@image.get_color_rgb_at(x,y),x,y)
       end
       MCDotArtMaker.puts "Done!"
 
       @calculation_count = 0
     end
-    def image_loaded?
-      !@cells.nil?
+    # def image_loaded?
+    #   !@dots.nil?
+    # end
+
+    def block_ids
+      # calculate
+
+      @dots.reduce([]) do |list, cell|
+        list << cell.block.id
+      end
+    end
+    def block_data
+      # calculate
+
+      @dots.reduce([]) do |list, cell|
+        list << cell.block.data
+      end
+    end
+    def check_not_locked
+      raise(CannotModifyImageError,"You cannot modifiy the image after calculation.") if @is_locked
+    end
+    def lock_image
+      @is_locked = true
+    end
+    def image_locked?
+      @is_locked
+    end
+
+    class << self
+      def calculate_before(*_methods)
+        methods = Array(_methods)
+        methods.each do |method|
+          alias_method("#{method}_without_calculation",method)
+          define_method(method) do |*args|
+            calculate
+            self.send("#{method}_without_calculation",*args)
+          end
+        end
+      end
+
+      def generate_rmagick_delegation_methods(*_methods)
+        methods = Array(_methods)
+        methods.each do |method|
+          define_method(method) do |*args|
+            check_not_locked
+            @image.send("#{method}!",*args)
+          end
+        end
+      end
     end
+    calculate_before :mosaic_image, :texture_image, :write_schematic, :block_ids, :block_data
+    generate_rmagick_delegation_methods :resize_to_fit, :resize_to_fill
   end
 end

data/lib/mc_dot_art_maker/schematic_helper.rb

@@ -4,7 +4,7 @@ module MCDotArtMaker
   #= .schematicを処理するためのクラス
   # nbt_utilsをラップして書き込み機能を追加する
   class SchematicHelper
-    include Singleton
+    # include Singleton
     attr_reader :blocks,:data
     attr_reader :weOffsetX,:weOffsetY,:weOffsetZ
     attr_reader :weOriginX,:weOriginY,:weOriginZ

data/lib/mc_dot_art_maker/texture_loader.rb

@@ -7,7 +7,7 @@ module MCDotArtMaker
   class TextureLoader
     TEXTURE_DIR = File.join(File.dirname(__FILE__),"textures")
     TEXTURE_TMP_DIR = File.join(TEXTURE_DIR,"tmp")
-    
+
     def initialize(jar = nil)
       @jar = jar || jars.last
     end
@@ -32,13 +32,6 @@ module MCDotArtMaker
 
         Zip::File.open(jar_file_path) do |zip|
           zip.each do |entry|
-            # puts "entry #{entry.to_s}"
-
-            # if md = /\Aassets\/minecraft\/textures\/blocks\/(.*).png\Z/.match(entry.to_s)
-            #   # p md[1]
-            #   entry.extract(File.join("textures", md[1]) + ".png")
-            # end
-
             if md = /\Aassets\/minecraft\/textures\/blocks\/#{filename}\Z/.match(entry.to_s)
               entry.extract(File.join(TEXTURE_DIR, filename))
               return Magick::ImageList.new(File.join(TEXTURE_DIR,filename)).first
@@ -61,7 +54,7 @@ module MCDotArtMaker
     end
 
 
-    # private
+    private
     def os
       @os ||= (
       host_os = RbConfig::CONFIG['host_os']

data/lib/mc_dot_art_maker/utils.rb

@@ -1,32 +1,32 @@
 module MCDotArtMaker
-  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/257, pixels[0].green/257, pixels[0].blue/257
-    end
-    sum_r = pixels.reduce(0) do |a,elem|
-      a+elem.red/257
-    end
-    ave_r = sum_r/pixels.size
-
-    sum_g = pixels.reduce(0) do |a,elem|
-      a+elem.green/257
-    end
-    ave_g = sum_g/pixels.size
-
-    sum_b = pixels.reduce(0) do |a,elem|
-      a+elem.blue/257
-    end
-    ave_b = sum_b/pixels.size
-
-    [ave_r, ave_g, ave_b]
-  end
+  # 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/257, pixels[0].green/257, pixels[0].blue/257
+  #   end
+  #   sum_r = pixels.reduce(0) do |a,elem|
+  #     a+elem.red/257
+  #   end
+  #   ave_r = sum_r/pixels.size
+  #
+  #   sum_g = pixels.reduce(0) do |a,elem|
+  #     a+elem.green/257
+  #   end
+  #   ave_g = sum_g/pixels.size
+  #
+  #   sum_b = pixels.reduce(0) do |a,elem|
+  #     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

data/mc_dot_art_maker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = 'mc_dot_art_maker'
-	s.version = '0.3.3'
+	s.version = '0.4.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_block_list.rb

@@ -24,4 +24,12 @@ class BlockListTest < Test::Unit::TestCase
       assert_equal(16, block.texture.columns)
     end
   end
+
+  def test_color_palette
+    @block_list.color_palette.write("test/images/tmp/palette.png")
+
+    assert_equal(Magick::Image, @block_list.color_palette.class)
+    assert_equal(Digest::MD5.file("test/images/sample/palette.png"),
+      Digest::MD5.file("test/images/tmp/palette.png"))
+  end
 end

data/test/test_dither_method.rb

@@ -4,7 +4,7 @@ require "digest/md5"
 
 
 class BlockPaletteTest < Test::Unit::TestCase
-  TMP_DIR = "images/tmp"
+  TMP_DIR = "test/images/tmp"
   METHODS = [MCDotArtMaker::NoDitherMethod,MCDotArtMaker::RiemersmaDitherMethod,MCDotArtMaker::FloydSteinbergDitherMethod]
 
   class << self
@@ -15,15 +15,15 @@ class BlockPaletteTest < Test::Unit::TestCase
   end
   def setup
     METHODS.each do |m|
-      maker = MCDotArtMaker::Maker.new("images/src/test_image.jpg",m)
-      maker.texture_image.write "images/tmp/dither_methods_#{m}.png"
+      maker = MCDotArtMaker::Maker.new("test/images/src/test_image.jpg",m)
+      maker.texture_image.write "test/images/tmp/dither_methods_#{m}.png"
     end
   end
 
   def test_dither_methods
     METHODS.each do |m|
-      assert_equal(Digest::MD5.file("images/sample/dither_methods_#{m}.png"),
-        Digest::MD5.file("images/tmp/dither_methods_#{m}.png"))
+      assert_equal(Digest::MD5.file("test/images/sample/dither_methods_#{m}.png"),
+        Digest::MD5.file("test/images/tmp/dither_methods_#{m}.png"))
     end
   end
 end

data/test/test_dot.rb

@@ -0,0 +1,44 @@
+require_relative '../lib/mc_dot_art_maker'
+require 'test/unit'
+
+class DotTest < Test::Unit::TestCase
+  def setup
+    @block_list = MCDotArtMaker::BlockList.instance
+    MCDotArtMaker::Dot.set_color_palette(@block_list)
+  end
+
+  def test_determine_block
+    dots = []
+    dots << MCDotArtMaker::Dot.new(Color::RGB.new(221, 221, 221),0,0)
+    dots <<  MCDotArtMaker::Dot.new(Color::RGB.new(231, 228, 219),0,0)
+    dots << MCDotArtMaker::Dot.new(Color::RGB.new(231, 228, 219),0,0)
+    dots << MCDotArtMaker::Dot.new(Color::RGB.new(114, 119, 106),0,0)
+    dots << MCDotArtMaker::Dot.new(Color::RGB.new(249, 236, 78),0,0)
+
+    expected_blocks =[]
+    expected_blocks << :white_wool
+    expected_blocks << :chiseled_quartz_block
+    expected_blocks << :chiseled_quartz_block
+    expected_blocks << :mossy_stone_bricks
+    expected_blocks << :gold_block
+    # blocks = dots.map do |dot|
+    #   dot.determine_block
+    # end
+    blocks = dots.map(&:determine_block)
+
+    blocks.each do |block|
+      assert_equal(MCDotArtMaker::Block, block.class)
+    end
+
+    blocks.zip(expected_blocks) do |block, expectation|
+      assert_equal(expectation, block.name)
+    end
+  end
+
+  def test_determin_block_for_all_colors
+    @block_list.each do |block|
+      dot = MCDotArtMaker::Dot.new(block.color,0,0)
+      assert_equal(MCDotArtMaker::Block, dot.determine_block.class)
+    end
+  end
+end