pxlsrt 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa77df27b6a2bcd94f0b1e23855baa5219e25f16
-  data.tar.gz: a3b71ee3d6f67fb348628bd917491db1193474bf
+  metadata.gz: f915f6a50a406234a4f1c274cde03d3bc48b6cd1
+  data.tar.gz: 8bfbb3d85700fb157eaede9f2c25ecec7e0b8a24
 SHA512:
-  metadata.gz: 6dd4f1a8187e9ccf3bab9e7735a190f53491404caa40bc3ae776b53077b4193cb820a62ce6973151aa613bf0beed0b3d76193c69bdd53b66644445155197a72f
-  data.tar.gz: 43d0246a46cebfce1a22e4e817a65c8ead7fb5efd40f8daa4a0a5850ba054030b3f485701cc1191ec42bb846baf8a849e85eb8af99ef190534383eb98fdfa0ac
+  metadata.gz: ace76e75cfb0c2f928ca5f66817074e8f01464a07c8fd189bfa736ef20307b0b0cd1015b08ae1d638b9003f83acac508f0ad166beed4846083cc809597f32e7e
+  data.tar.gz: 2ab1738d82add3b876efe9efd5bb9897ccd4958f1ab06939a564e37ff01545516ecee9b28dd02cd3c6beae6e7a709c6fe3c25a8bce1350364d1cae0addabbe29

data/lib/pxlsrt/colors.rb

@@ -6,7 +6,7 @@ module Pxlsrt
 	class Colors
 		##
 		# List of sorting methods.
-		METHODS = ["sum-rgb", "red", "green", "blue", "sum-hsb", "hue", "saturation", "brightness", "uniqueness", "luma", "random", "cyan", "magenta", "yellow", "alpha", "sum-rgba", "sum-hsba"]
+		METHODS = ["sum-rgb", "red", "green", "blue", "sum-hsb", "hue", "saturation", "brightness", "uniqueness", "luma", "random", "cyan", "magenta", "yellow", "alpha", "sum-rgba", "sum-hsba", "none"]
 		##
 		# Converts a ChunkyPNG pixel into an array of the red, green, blue, and alpha values
 		def self.getRGBA(pxl)
@@ -72,55 +72,63 @@ module Pxlsrt
 		# * luma
 		# * random
 		# * alpha
+		# * none
 		def self.pixelSort(list, how, reverse)
 			mhm=[]
 			Pxlsrt::Helpers.error(list) if list.length == 0
+			if reverse == 0
+				k = 1
+			elsif reverse == 1
+				k = -1
+			else
+				k = [-1, 1].sample
+			end
 			case how.downcase
 				when "sum-rgb"
-					mhm = list.sort_by { |c| ChunkyPNG::Color.r(c)+ChunkyPNG::Color.g(c)+ChunkyPNG::Color.b(c) }
+					mhm = list.sort_by { |c| k * (ChunkyPNG::Color.r(c)+ChunkyPNG::Color.g(c)+ChunkyPNG::Color.b(c)) }
 				when "sum-rgba"
-					mhm =list.sort_by { |c| ChunkyPNG::Color.r(c)+ChunkyPNG::Color.g(c)+ChunkyPNG::Color.b(c)+ChunkyPNG::Color.a(c) }
+					mhm =list.sort_by { |c| k * (ChunkyPNG::Color.r(c)+ChunkyPNG::Color.g(c)+ChunkyPNG::Color.b(c)+ChunkyPNG::Color.a(c)) }
 				when "red"
-					mhm = list.sort_by { |c| ChunkyPNG::Color.r(c) }
+					mhm = list.sort_by { |c| k * ChunkyPNG::Color.r(c) }
 				when "yellow"
-					mhm =list.sort_by { |c| ChunkyPNG::Color.r(c)+ChunkyPNG::Color.g(c) }
+					mhm =list.sort_by { |c| k * (ChunkyPNG::Color.r(c)+ChunkyPNG::Color.g(c)) }
 				when "green"
-					mhm = list.sort_by { |c| ChunkyPNG::Color.g(c) }
+					mhm = list.sort_by { |c| k * ChunkyPNG::Color.g(c) }
 				when "cyan"
-					mhm =list.sort_by { |c| ChunkyPNG::Color.g(c)+ChunkyPNG::Color.b(c) }
+					mhm =list.sort_by { |c| k * (ChunkyPNG::Color.g(c)+ChunkyPNG::Color.b(c)) }
 				when "blue"
-					mhm = list.sort_by { |c| ChunkyPNG::Color.b(c) }
+					mhm = list.sort_by { |c| k * ChunkyPNG::Color.b(c) }
 				when "magenta"
-					mhm =list.sort_by { |c| ChunkyPNG::Color.r(c)+ChunkyPNG::Color.b(c) }
+					mhm =list.sort_by { |c| k * (ChunkyPNG::Color.r(c)+ChunkyPNG::Color.b(c)) }
 				when "hue"
-					mhm = list.sort_by { |c| ChunkyPNG::Color.to_hsb(c)[0] % 360 }
+					mhm = list.sort_by { |c| k * (ChunkyPNG::Color.to_hsb(c)[0] % 360) }
 				when "saturation"
-					mhm = list.sort_by { |c| ChunkyPNG::Color.to_hsb(c)[1] }
+					mhm = list.sort_by { |c| k * ChunkyPNG::Color.to_hsb(c)[1] }
 				when "brightness"
-					mhm = list.sort_by { |c| ChunkyPNG::Color.to_hsb(c)[2] }
+					mhm = list.sort_by { |c| k * ChunkyPNG::Color.to_hsb(c)[2] }
 				when "sum-hsb"
-					mhm = list.sort_by { |c| k = ChunkyPNG::Color.to_hsb(c); (k[0] % 360) / 360.0 + k[1] + k[2] }
+					mhm = list.sort_by { |c| hsb = ChunkyPNG::Color.to_hsb(c); k * ((hsb[0] % 360) / 360.0 + hsb[1] + hsb[2]) }
 				when "sum-hsba"
-					mhm = list.sort_by { |c| k = ChunkyPNG::Color.to_hsb(c); (k[0] % 360) / 360.0 + k[1] + k[2] + ChunkyPNG::Color.a(c) / 255.0 }
+					mhm = list.sort_by { |c| hsb = ChunkyPNG::Color.to_hsb(c); k * ((hsb[0] % 360) / 360.0 + hsb[1] + hsb[2] + ChunkyPNG::Color.a(c) / 255.0) }
 				when "uniqueness"
 					avg = Pxlsrt::Colors.colorAverage(list, true)
-					mhm = list.sort_by { |c| Pxlsrt::Colors.colorUniqueness(c, [avg], true) }
+					mhm = list.sort_by { |c| k * Pxlsrt::Colors.colorUniqueness(c, [avg], true) }
 				when "luma"
-					mhm = list.sort_by { |c| ChunkyPNG::Color.r(c) * 0.2126 + ChunkyPNG::Color.g(c) * 0.7152 + ChunkyPNG::Color.b(c) * 0.0722 + ChunkyPNG::Color.a(c) }
+					mhm = list.sort_by { |c| k * (ChunkyPNG::Color.r(c) * 0.2126 + ChunkyPNG::Color.g(c) * 0.7152 + ChunkyPNG::Color.b(c) * 0.0722 + ChunkyPNG::Color.a(c)) }
 				when "random"
 					mhm = list.shuffle
 				when "alpha"
-					mhm = list.sort_by{ |c| ChunkyPNG::Color.a(c) }
+					mhm = list.sort_by{ |c| k * ChunkyPNG::Color.a(c) }
+				when "none"
+					if k == -1
+						mhm = list.reverse
+					else
+						mhm = list
+					end
 				else
-					mhm = list.sort_by { |c| ChunkyPNG::Color.r(c)+ChunkyPNG::Color.g(c)+ChunkyPNG::Color.b(c) }
-			end
-			if reverse == 0
-				return mhm
-			elsif reverse == 1
-				return mhm.reverse
-			else
-				return [true, false].sample ? mhm : mhm.reverse
+					mhm = list.sort_by { |c| k * (ChunkyPNG::Color.r(c)+ChunkyPNG::Color.g(c)+ChunkyPNG::Color.b(c)) }
 			end
+			return mhm
 		end
 		##
 		# Turns an RGB-like array into ChunkyPNG's color

data/lib/pxlsrt/version.rb

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

metadata

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