Merge 037c3e9 into a0d13d9

codingteam · Feb 7, 2016 · c23844b · c23844b
2 parents a0d13d9 + 037c3e9
commit c23844b
Show file tree

Hide file tree

Showing 19 changed files with 75,307 additions and 3 deletions.
diff --git a/Cask b/Cask
@@ -7,7 +7,8 @@
        ("maps" "maps/*.txt")
        ("signs" "signs/*.txt")
        ("sprites" "sprites/*.json")
-       ("sprites" "sprites/*.xpm"))
+       ("sprites" "sprites/*.xpm")
+       ("sprites" "sprites/*.txt"))
 
 (development
  (depends-on "el-mock")

diff --git a/pacmacs-image.el b/pacmacs-image.el
@@ -32,6 +32,9 @@
 
 ;;; Code:
 
+(require 'f)
+(require 'color)
+
 (require 'pacmacs-utils)
 
 (defun pacmacs--make-image-data (width height)
@@ -128,6 +131,54 @@
               (aset (aref canvas-data canvas-y) canvas-x
                     image-color))))))))
 
+
+(defun pacmacs--parse-im-enum-header (header)
+  (let ((header-regexp (concat "# ImageMagick pixel enumeration: "
+                               "\\([[:digit:]]+\\),\\([[:digit:]]+\\),"
+                               "\\([[:digit:]]+\\)")))
+    (if (string-match header-regexp header)
+        (list (string-to-number (match-string 1 header))
+              (string-to-number (match-string 2 header))
+              (string-to-number (match-string 3 header)))
+      (error "Incorrect ImageMagick pixel enumeration header: %s" header))))
+
+(defun pacmacs--match-int (num s)
+  (string-to-number (match-string num s)))
+
+(defun pacmacs--parse-im-enum-pixel (pixel colorspace)
+  (let ((pixel-regexp (concat "\\([[:digit:]]+\\),\\([[:digit:]]+\\):[[:space:]]*"
+                              "([[:space:]]*\\([[:digit:]]+\\),"
+                              "[[:space:]]*\\([[:digit:]]+\\),"
+                              "[[:space:]]*\\([[:digit:]]+\\),"
+                              "[[:space:]]*\\([[:digit:]]+\\))")))
+    (if (string-match pixel-regexp pixel)
+        (list (string-to-number (match-string 1 pixel))
+              (string-to-number (match-string 2 pixel))
+              (let ((r (pacmacs--match-int 3 pixel))
+                    (g (pacmacs--match-int 4 pixel))
+                    (b (pacmacs--match-int 5 pixel))
+                    (a (pacmacs--match-int 6 pixel))
+                    (k (/ 1.0 colorspace)))
+                (if (zerop a)
+                    nil
+                  (color-rgb-to-hex (* r k)
+                                    (* g k)
+                                    (* b k)))))
+      (error "Incorrect ImageMagick pixel enumeration pixel: %s" pixel))))
+
+(defun pacmacs--read-im-enum-image (filename)
+  (-let* (((header-raw . data-raw) (-> filename
+                                       (f-read-text)
+                                       (split-string "\n" t)))
+          (header (pacmacs--parse-im-enum-header header-raw)))
+    (-let (((width height colorspace) header))
+      (let ((image (pacmacs--make-image width height)))
+        (-each data-raw
+          (-lambda (pixel-raw)
+            (-let (((x y color) (pacmacs--parse-im-enum-pixel pixel-raw colorspace)))
+              (pacmacs--set-image-pixel image x y color))))
+        image))))
+
 (defun pacmacs--image-to-xpm (image)
   (plist-bind ((width :width)
                (height :height)

diff --git a/sprites/Big-Pill.txt b/sprites/Big-Pill.txt
diff --git a/sprites/Blinking-Terrified-Ghost.txt b/sprites/Blinking-Terrified-Ghost.txt
diff --git a/sprites/Makefile b/sprites/Makefile
@@ -1,10 +1,14 @@
-PILL=Pill.json Pill.xpm
+IM_ENUMS=Big-Pill.txt Blinking-Terrified-Ghost.txt Pacman-Chomping-Down.txt Pacman-Chomping-Left.txt Pacman-Chomping-Right.txt Pacman-Chomping-Up.txt Pacman-Death.txt Pill.txt Red-Ghost-Down.txt Red-Ghost-Left.txt Red-Ghost-Right.txt Red-Ghost-Up.txt Red-Ghost-Win.txt Terrified-Ghost.txt
+PILL=Pill.json Pill.xpm Pill.txt
 BIG_PILL=Big-Pill.json Big-Pill.xpm
 PACMAN_DEATH=Pacman-Death.json Pacman-Death.xpm
 TERRIFIED_GHOST=Terrified-Ghost.json Terrified-Ghost.xpm
 BLINKING_TERRIFIED_GHOST=Blinking-Terrified-Ghost.json Blinking-Terrified-Ghost.xpm
 
-all: $(PILL) $(BIG_PILL) $(PACMAN_DEATH) $(TERRIFIED_GHOST) $(BLINKING_TERRIFIED_GHOST) Makefile
+all: $(IM_ENUMS) $(PILL) $(BIG_PILL) $(PACMAN_DEATH) $(TERRIFIED_GHOST) $(BLINKING_TERRIFIED_GHOST) Makefile
+
+%.txt: %.xpm
+	convert $< $@
 
 Pill.json: Pill.raw.json
 	jq ".meta.image |= \"Pill.xpm\"" Pill.raw.json > Pill.json

diff --git a/sprites/Pacman-Chomping-Down.txt b/sprites/Pacman-Chomping-Down.txt
diff --git a/sprites/Pacman-Chomping-Left.txt b/sprites/Pacman-Chomping-Left.txt
diff --git a/sprites/Pacman-Chomping-Right.txt b/sprites/Pacman-Chomping-Right.txt
diff --git a/sprites/Pacman-Chomping-Up.txt b/sprites/Pacman-Chomping-Up.txt
diff --git a/sprites/Pacman-Death.txt b/sprites/Pacman-Death.txt
diff --git a/sprites/Pill.txt b/sprites/Pill.txt
diff --git a/sprites/Red-Ghost-Down.txt b/sprites/Red-Ghost-Down.txt
diff --git a/sprites/Red-Ghost-Left.txt b/sprites/Red-Ghost-Left.txt
diff --git a/sprites/Red-Ghost-Right.txt b/sprites/Red-Ghost-Right.txt
diff --git a/sprites/Red-Ghost-Up.txt b/sprites/Red-Ghost-Up.txt
diff --git a/sprites/Red-Ghost-Win.txt b/sprites/Red-Ghost-Win.txt
diff --git a/sprites/Terrified-Ghost.txt b/sprites/Terrified-Ghost.txt
diff --git a/test-data/2x2.txt b/test-data/2x2.txt
@@ -0,0 +1,5 @@
+# ImageMagick pixel enumeration: 2,2,65535,srgba
+0,0:(65535,0,0,65535)
+0,1:(0,65535,0,65535)
+1,0:(0,0,65535,65535)
+1,1:(0,0,0,0)
diff --git a/test/pacmacs-image-test.el b/test/pacmacs-image-test.el
@@ -95,3 +95,32 @@
         (let ((color (aref (aref expected-canvas-data y) x)))
           (should (equal color
                          (pacmacs--get-image-pixel canvas-image x y))))))))
+
+(ert-deftest pacmacs--read-im-enum-image-test ()
+  (let* ((image-filename "test-data/2x2.txt")
+         (image (pacmacs--read-im-enum-image image-filename))
+         (expected-pixels '((0 0 "#ff0000")
+                            (0 1 "#00ff00")
+                            (1 0 "#0000ff")
+                            (1 1 nil))))
+
+    (should (= 2 (pacmacs--image-width image)))
+    (should (= 2 (pacmacs--image-height image)))
+
+    (-all-p (-lambda ((x y color))
+              (should (equal color (pacmacs--get-image-pixel image x y))))
+            expected-pixels)))
+
+(ert-deftest pacmacs--parse-im-enum-header-test ()
+  (let* ((input-header "# ImageMagick pixel enumeration: 80,40,255,srgba")
+         (expected-result (list 80 40 255)))
+    (should (equal expected-result
+                   (pacmacs--parse-im-enum-header input-header)))
+    (should-error (pacmacs--parse-im-enum-header "khooy") :type 'error)))
+
+(ert-deftest pacmacs--parse-im-enum-pixel-test ()
+  (let ((input-pixel "60,16: ( 255,  255,   255,    255)  #khooy")
+        (expected-result (list 60 16 "#ffffff")))
+    (should (equal expected-result
+                   (pacmacs--parse-im-enum-pixel input-pixel 255)))
+    (should-error (pacmacs--parse-im-enum-pixel "khooy") :type 'error)))