pxlsrt 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 230df80c367a553e25218d63f36b19b95643ca38
-  data.tar.gz: 02829c2d157cbab4b1411fa869f7ce332f210506
+  metadata.gz: 261def653de6b5100adf27ef5e0322d097d16563
+  data.tar.gz: 2e5e58532b22930c4b91d00b4beb62eca0b2077c
 SHA512:
-  metadata.gz: ad3a94f33d897a9dfee3f8c366af715f0d6349611d787d6c44baa1235eeef1ccc0bf43ad914d2598d337262f8795a59dba4a9c20350e91794007b96fd8c656dc
-  data.tar.gz: 75dbb6d353eae5d195683c9a5dd136542ad86cccca68ccba32c53813955ae341107b79115d2faf4b6cbc8f2f9c64d52ce380e4d18b70a8b6b4f129996a6b6efe
+  metadata.gz: 320adc9d126207b337658fdaa7797a54de176db706232ddf30988ff4033dcd3e5cf51765a3f97130e0d49088187a8e15a41aae836ec402c42f919fe30d7b43a6
+  data.tar.gz: b0d6a304921ea9dabbc4ac2d9147a54d81667767f70922b0d673902c9f073b9769bee49d398b4cffe970275149d3b317afeb08d997963917886802577fa223fe

data/bin/pxlsrt

@@ -18,7 +18,7 @@ class CLI < Thor
 	class_option :vertical, :type => :boolean, :default => false, :aliases => "-v"
 	class_option :diagonal, :type => :boolean, :default => false, :aliases => "-d"
 	class_option :smooth, :type => :boolean, :default => false, :aliases => "-s"
-	class_option :method, :type => :string, :default => "sum-rgb", :banner => "[sum-rgb | red | green | blue | sum-hsb | hue | saturation | brightness | uniqueness | luma | random]", :aliases => "-m", :enum => ["sum-rgb", "red", "green", "blue", "sum-hsb", "hue", "saturation", "brightness", "uniqueness", "luma", "random"]
+	class_option :method, :type => :string, :default => "sum-rgb", :banner => "[sum-rgb | red | green | blue | sum-hsb | hue | saturation | brightness | uniqueness | luma | random | cyan | magenta | yellow | alpha | sum-rgba | sum-hsba]", :aliases => "-m", :enum => ["sum-rgb", "red", "green", "blue", "sum-hsb", "hue", "saturation", "brightness", "uniqueness", "luma", "random", "cyan", "magenta", "yellow", "alpha", "sum-rgba", "sum-hsba"]
 	class_option :verbose, :type => :boolean, :default => false, :aliases => "-V"
 
 	option :min, :type => :numeric, :default => Float::INFINITY, :banner => "MINIMUM BANDWIDTH"

data/lib/pxlsrt/brute.rb

@@ -34,7 +34,7 @@ module Pxlsrt
 				:vertical => [false, true],
 				:diagonal => [false, true],
 				:smooth => [false, true],
-				:method => ["sum-rgb", "red", "green", "blue", "sum-hsb", "hue", "saturation", "brightness", "uniqueness", "luma", "random"],
+				:method => ["sum-rgb", "red", "green", "blue", "sum-hsb", "hue", "saturation", "brightness", "uniqueness", "luma", "random", "cyan", "magenta", "yellow", "alpha", "sum-rgba", "sum-hsba"],
 				:verbose => [false, true],
 				:min => [Float::INFINITY, {:class => [Fixnum]}],
 				:max => [Float::INFINITY, {:class => [Fixnum]}],
@@ -76,7 +76,7 @@ module Pxlsrt
 				Pxlsrt::Helpers.verbose("Retrieving RGB values of pixels...") if options[:verbose]
 				kml=[]
 				for xy in 0..(w*h-1)
-					kml.push(Pxlsrt::Colors.getRGB(png[xy % w,(xy/w).floor]))
+					kml.push(Pxlsrt::Colors.getRGBA(png[xy % w,(xy/w).floor]))
 				end
 				if options[:vertical]==true
 					Pxlsrt::Helpers.verbose("Rotating image for vertical mode...") if options[:verbose]
@@ -134,7 +134,7 @@ module Pxlsrt
 				end
 				Pxlsrt::Helpers.verbose("Giving pixels new RGB values...") if options[:verbose]
 				for xy in 0..(w*h-1)
-					sorted[xy % w, (xy/w).floor]=Pxlsrt::Colors.arrayToRGB(toImage[xy])
+					sorted[xy % w, (xy/w).floor]=Pxlsrt::Colors.arrayToRGBA(toImage[xy])
 				end
 				endTime=Time.now
 				timeElapsed=endTime-startTime

data/lib/pxlsrt/colors.rb

@@ -5,9 +5,9 @@ module Pxlsrt
 	# Includes color and image operations.
 	class Colors
 		##
-		# Converts a ChunkyPNG pixel into an array of the reg, green, and blue values
-		def self.getRGB(pxl)
-			return [ChunkyPNG::Color.r(pxl), ChunkyPNG::Color.g(pxl), ChunkyPNG::Color.b(pxl)]
+		# Converts a ChunkyPNG pixel into an array of the red, green, blue, and alpha values
+		def self.getRGBA(pxl)
+			return [ChunkyPNG::Color.r(pxl), ChunkyPNG::Color.g(pxl), ChunkyPNG::Color.b(pxl), ChunkyPNG::Color.a(pxl)]
 		end
 		##
 		# Check if file is a PNG image. ChunkyPNG only works with PNG images. Eventually, I might use conversion tools to add support, but not right now.
@@ -119,12 +119,13 @@ module Pxlsrt
 			r=((ca.collect { |c| c[0] }).inject{ |sum, el| sum+el }).to_f / ca.size
 			g=((ca.collect { |c| c[1] }).inject{ |sum, el| sum+el }).to_f / ca.size
 			b=((ca.collect { |c| c[2] }).inject{ |sum, el| sum+el }).to_f / ca.size
-			return [r,g,b]
+			a=((ca.collect { |c| c[3] }).inject{ |sum, el| sum+el }).to_f / ca.size
+			return [r,g,b,a]
 		end
 		##
 		# Determines color distance from each other using the Pythagorean theorem.
 		def self.colorDistance(c1,c2)
-			return Math.sqrt((c1[0]-c2[0])**2+(c1[1]-c2[1])**2+(c1[2]-c2[2])**2)
+			return Math.sqrt((c1[0]-c2[0])**2+(c1[1]-c2[1])**2+(c1[2]-c2[2])**2+(c1[3]-c2[3])**2)
 		end
 		##
 		# Uses a combination of color averaging and color distance to find how "unique" a color is.
@@ -133,17 +134,43 @@ module Pxlsrt
 		end
 		##
 		# Sorts an array of colors based on a method.
+		# Available methods:
+		# * sum-rgb (default)
+		# * sum-rgba
+		# * red
+		# * yellow
+		# * green
+		# * cyan
+		# * blue
+		# * magenta
+		# * hue
+		# * saturation
+		# * brightness
+		# * sum-hsb
+		# * sum-hsba
+		# * uniqueness
+		# * luma
+		# * random
+		# * alpha
 		def self.pixelSort(list, how, reverse)
 			mhm=[]
 			case how.downcase
 				when "sum-rgb"
 					mhm= list.sort_by { |c| Pxlsrt::Colors.pxldex(c) }
+				when "sum-rgba"
+					mhm=list.sort_by { |c| Pxlsrt::Colors.pxldex(c)+c[3] }
 				when "red"
 					mhm= list.sort_by { |c| c[0] }
+				when "yellow"
+					mhm=list.sort_by { |c| c[0]+c[1] }
 				when "green"
 					mhm= list.sort_by { |c| c[1] }
+				when "cyan"
+					mhm=list.sort_by { |c| c[1]+c[2] }
 				when "blue"
 					mhm= list.sort_by { |c| c[2] }
+				when "magenta"
+					mhm=list.sort_by { |c| c[0]+c[2] }
 				when "hue"
 					mhm= list.sort_by { |c| Pxlsrt::Colors.rgb2hsb(c)[0] }
 				when "saturation"
@@ -152,6 +179,8 @@ module Pxlsrt
 					mhm= list.sort_by { |c| Pxlsrt::Colors.rgb2hsb(c)[2] }
 				when "sum-hsb"
 					mhm= list.sort_by { |c| k=Pxlsrt::Colors.rgb2hsb(c); k[0]*100/360+k[1]+k[2] }
+				when "sum-hsb"
+					mhm= list.sort_by { |c| k=Pxlsrt::Colors.rgb2hsb(c); k[0]*100/360+k[1]+k[2]+k[3]*100/255 }
 				when "uniqueness"
 					avg=Pxlsrt::Colors.colorAverage(list)
 					mhm=list.sort_by { |c| Pxlsrt::Colors.colorUniqueness(c, [avg]) }
@@ -159,6 +188,8 @@ module Pxlsrt
 					mhm=list.sort_by { |c| Pxlsrt::Colors.pxldex([c[0]*0.2126, c[1]*0.7152, c[2]*0.0722]) }
 				when "random"
 					mhm=list.shuffle
+				when "alpha"
+					mhm=list.sort_by{ |c| c[3] }
 				else
 					mhm= list.sort_by { |c| Pxlsrt::Colors.pxldex(c) }
 			end
@@ -210,8 +241,8 @@ module Pxlsrt
 		end
 		##
 		# Turns an RGB-like array into ChunkyPNG's color
-		def self.arrayToRGB(a)
-			return ChunkyPNG::Color.rgb(a[0], a[1], a[2])
+		def self.arrayToRGBA(a)
+			return ChunkyPNG::Color.rgba(a[0], a[1], a[2], a[3])
 		end
 		##
 		# Used in determining Sobel values.

data/lib/pxlsrt/smart.rb

@@ -36,7 +36,7 @@ module Pxlsrt
 				:vertical => [false, true],
 				:diagonal => [false, true],
 				:smooth => [false, true],
-				:method => ["sum-rgb", "red", "green", "blue", "sum-hsb", "hue", "saturation", "brightness", "uniqueness", "luma", "random"],
+				:method => ["sum-rgb", "red", "green", "blue", "sum-hsb", "hue", "saturation", "brightness", "uniqueness", "luma", "random", "cyan", "magenta", "yellow", "alpha", "sum-rgba", "sum-hsba"],
 				:verbose => [false, true],
 				:absolute => [false, true],
 				:threshold => [{:class => [Float, Fixnum]}],
@@ -90,7 +90,7 @@ module Pxlsrt
 					else
 						val = 2000000000
 					end
-					k.push({ "sobel" => val, "pixel" => [x, y], "color" => Pxlsrt::Colors.getRGB(img[x, y]) })
+					k.push({ "sobel" => val, "pixel" => [x, y], "color" => Pxlsrt::Colors.getRGBA(img[x, y]) })
 				end
 				if options[:vertical]==true
 					Pxlsrt::Helpers.verbose("Rotating image for vertical mode...") if options[:verbose]
@@ -213,7 +213,7 @@ module Pxlsrt
 				end
 				Pxlsrt::Helpers.verbose("Giving pixels new RGB values...") if options[:verbose]
 				for px in 0..(w*h-1)
-					edge[px % w, (px/w).floor]=Pxlsrt::Colors.arrayToRGB(image[px])
+					edge[px % w, (px/w).floor]=Pxlsrt::Colors.arrayToRGBA(image[px])
 				end
 				endTime=Time.now
 				timeElapsed=endTime-startTime

data/lib/pxlsrt/version.rb

@@ -1,5 +1,5 @@
 ##
 # The main module, your best friend.
 module Pxlsrt
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pxlsrt
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - EVA-01
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler