[nongnu] elpa/pacmacs 3070cf0e6a 063/472: Merge branch 'refactor-image-resource-51'. Close #51

[ELPA Syncer]

branch: elpa/pacmacs
commit 3070cf0e6ade12d3f191e72493cce151d8616613
Merge: 1414723d42 298b950310
Author: rexim <reximkut@gmail.com>
Commit: rexim <reximkut@gmail.com>

    Merge branch 'refactor-image-resource-51'. Close #51
---
 pacman-anim.el                         |  4 ++--
 pacman-resources.el => pacman-image.el | 19 ++++++++++++++++---
 pacman.el                              | 16 +++++-----------
 test/pacman-anim-test.el               |  2 +-
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/pacman-anim.el b/pacman-anim.el
index 8dedc4b128..4fe3b118e4 100644
--- a/pacman-anim.el
+++ b/pacman-anim.el
@@ -34,7 +34,7 @@
 
 (require 'json)
 
-(require 'pacman-resources)
+(require 'pacman-image)
 
 (defun pacman-make-anim (frames sprite-sheet)
   (list :frames frames
@@ -44,7 +44,7 @@
 (defun pacman-load-anim (aseprite-json-file sprite-sheet-file)
   (let* ((aseprite-json (json-read-file aseprite-json-file))
          (aseprite-frames (cdr (assoc 'frames aseprite-json)))
-         (sprite-sheet (pacman-load-resource sprite-sheet-file)))
+         (sprite-sheet (pacman-load-image sprite-sheet-file)))
     (pacman-make-anim
      (mapcar 'pacman-convert-aseprite-frame
              (sort aseprite-frames
diff --git a/pacman-resources.el b/pacman-image.el
similarity index 77%
rename from pacman-resources.el
rename to pacman-image.el
index 87b9a9327d..df1849c2b2 100644
--- a/pacman-resources.el
+++ b/pacman-image.el
@@ -1,4 +1,4 @@
-;;; pacman-resources.el --- Pacman for Emacs
+;;; pacman-image.el --- Pacman for Emacs
 
 ;; Copyright (C) 2015 Codingteam
 
@@ -32,13 +32,26 @@
 
 ;;; Code:
 
-(defun pacman-load-resource (filename)
+(defun pacman-load-image (filename)
   (create-image (concat default-directory filename)
                 'xpm nil :heuristic-mask t))
 
 (defun pacman-insert-image (resource resource-vector)
   (insert-image resource " " nil resource-vector))
 
-(provide 'pacman-resources)
+(defun pacman-create-color-block (width height color)
+  (create-image
+   (make-vector
+    width (make-bool-vector height t))
+   'xbm t :width width :height height
+   :foreground color))
+
+(defun pacman-create-transparent-block (width height)
+  (create-image
+   (make-vector
+    width (make-bool-vector height nil))
+   'xbm t :width width :height height))
+
+(provide 'pacman-image)
 
 ;;; pacman-anim.el ends here
diff --git a/pacman.el b/pacman.el
index dbff9f7b22..2ddfbeec99 100644
--- a/pacman.el
+++ b/pacman.el
@@ -36,7 +36,7 @@
 ;;; Code:
 
 (require 'pacman-anim)
-(require 'pacman-resources)
+(require 'pacman-image)
 (require 'pacman-utils)
 
 (defconst pacman-buffer-name "*Pacman*")
@@ -69,19 +69,13 @@
                                          "sprites/Pacman-Chomping-Right.xpm")))
 (defvar pacman-empty-cell nil)
 (setq pacman-empty-cell
-      (list :animation (pacman-make-anim '((0 0 40 40))
-                                         (create-image
-                                          (make-vector
-                                           40 (make-bool-vector 40 nil))
-                                          'xbm t :width 40 :height 40))))
+      (list :animation
+            (pacman-make-anim '((0 0 40 40))
+                              (pacman-create-transparent-block 40 40))))
 
 (defun pacman--make-wall-cell (row column)
   (list :animation (pacman-make-anim '((0 0 40 40))
-                                     (create-image
-                                      (make-vector
-                                       40 (make-bool-vector 40 t))
-                                      'xbm t :width 40 :height 40
-                                      :foreground "red"))
+                                     (pacman-create-color-block 40 40 "red"))
         :row row
         :column column))
 
diff --git a/test/pacman-anim-test.el b/test/pacman-anim-test.el
index 7db3407348..c82dc1b6aa 100644
--- a/test/pacman-anim-test.el
+++ b/test/pacman-anim-test.el
@@ -84,6 +84,6 @@
                            input-sprite-sheet)))
     (with-mock
      (mock (json-read-file *) => input-aseprite-format)
-     (mock (pacman-load-resource *) => input-sprite-sheet)
+     (mock (pacman-load-image *) => input-sprite-sheet)
      (should (equal expected-output
                     (pacman-load-anim "foo" "bar"))))))