From 865902dbe1fc50b34f08bbac40c7f06c133208fa Mon Sep 17 00:00:00 2001
From: TatriX <tatrics@gmail.com>
Date: Mon, 20 Sep 2021 17:17:59 +0200
Subject: [PATCH] Refactor tutorial 13

---
 13/tutorial-13.lisp => 13-alpha-blending.lisp |  17 +++++++++--------
 {13 => assets/13}/fadein.png                  | Bin
 {13 => assets/13}/fadeout.png                 | Bin
 sdl2-tutorial.asd                             |   2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename 13/tutorial-13.lisp => 13-alpha-blending.lisp (86%)
 rename {13 => assets/13}/fadein.png (100%)
 rename {13 => assets/13}/fadeout.png (100%)

diff --git a/13/tutorial-13.lisp b/13-alpha-blending.lisp
similarity index 86%
rename from 13/tutorial-13.lisp
rename to 13-alpha-blending.lisp
index 0f62a18..2b74747 100644
--- a/13/tutorial-13.lisp
+++ b/13-alpha-blending.lisp
@@ -1,8 +1,9 @@
-(defpackage #:sdl2-tutorial-13
-  (:use :common-lisp)
-  (:export :main))
+(defpackage #:sdl2-tutorial-13-alpha-blending
+  (:use :cl)
+  (:export :run)
+  (:import-from :sdl2-tutorial-utils :asset-pathname))
 
-(in-package :sdl2-tutorial-13)
+(in-package #:sdl2-tutorial-13-alpha-blending)
 
 (defparameter *screen-width* 640)
 (defparameter *screen-height* 480)
@@ -54,7 +55,7 @@
 (defmacro with-window-renderer ((window renderer) &body body)
   `(sdl2:with-init (:video)
      (sdl2:with-window (,window
-                        :title "SDL2 Tutorial"
+                        :title "SDL2 Tutorial 13"
                         :w *screen-width*
                         :h *screen-height*
                         :flags '(:shown))
@@ -70,11 +71,11 @@
 (defmacro clamp-decf (x delta)
   `(setf ,x (clamp (- ,x ,delta))))
 
-(defun main()
+(defun run ()
   (with-window-renderer (window renderer)
     (sdl2-image:init '(:png))
-    (let ((bg-texture (load-texture-from-file renderer "13/fadein.png"))
-          (modulated-texture (load-texture-from-file renderer "13/fadeout.png"))
+    (let ((bg-texture (load-texture-from-file renderer (asset-pathname "assets/13/fadein.png")))
+          (modulated-texture (load-texture-from-file renderer (asset-pathname "assets/13/fadeout.png")))
           (alpha 255)
           (delta 32))
       (set-blend-mode modulated-texture :blend)
diff --git a/13/fadein.png b/assets/13/fadein.png
similarity index 100%
rename from 13/fadein.png
rename to assets/13/fadein.png
diff --git a/13/fadeout.png b/assets/13/fadeout.png
similarity index 100%
rename from 13/fadeout.png
rename to assets/13/fadeout.png
diff --git a/sdl2-tutorial.asd b/sdl2-tutorial.asd
index ec6a897..eecee57 100644
--- a/sdl2-tutorial.asd
+++ b/sdl2-tutorial.asd
@@ -17,7 +17,7 @@
                (:file "10-color-keying")
                (:file "11-clip-rendering-and-sprite-sheets")
                (:file "12-color-modulation")
-               (:file "13/tutorial-13")
+               (:file "13-alpha-blending")
                (:file "14/tutorial-14")
                (:file "15/tutorial-15")
                (:file "16/tutorial-16"))