From cfec61dc402d162ae679a8f8563dc1525251a722 Mon Sep 17 00:00:00 2001
From: Yan <yan@metatem.net>
Date: Sat, 8 Jan 2022 02:02:29 +0100
Subject: [PATCH] Refactor tutorial 15

---
 ...rial-15.lisp => 15-rotation-and-flipping.lisp |  15 ++++++++-------
 {15 => assets/15}/arrow.png                      | Bin
 sdl2-tutorial.asd                                |   2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename 15/tutorial-15.lisp => 15-rotation-and-flipping.lisp (89%)
 rename {15 => assets/15}/arrow.png (100%)

diff --git a/15/tutorial-15.lisp b/15-rotation-and-flipping.lisp
similarity index 89%
rename from 15/tutorial-15.lisp
rename to 15-rotation-and-flipping.lisp
index 99699a0..9d980e8 100644
--- a/15/tutorial-15.lisp
+++ b/15-rotation-and-flipping.lisp
@@ -1,8 +1,9 @@
-(defpackage #:sdl2-tutorial-15
-  (:use :common-lisp)
-  (:export :main))
+(defpackage #:sdl2-tutorial-15-rotation-and-flipping
+  (:use :cl)
+  (:export :run)
+  (:import-from :sdl2-tutorial-utils :asset-pathname))
 
-(in-package :sdl2-tutorial-15)
+(in-package #:sdl2-tutorial-15-rotation-and-flipping)
 
 (defparameter *screen-width* 640)
 (defparameter *screen-height* 480)
@@ -51,17 +52,17 @@
 (defmacro with-window-renderer ((window renderer) &body body)
   `(sdl2:with-init (:video)
      (sdl2:with-window (,window
-                        :title "SDL2 Tutorial"
+                        :title "SDL2 Tutorial 15"
                         :w *screen-width*
                         :h *screen-height*
                         :flags '(:shown))
        (sdl2:with-renderer (,renderer ,window :index -1 :flags '(:accelerated))
          ,@body))))
 
-(defun main()
+(defun run ()
   (with-window-renderer (window renderer)
     (sdl2-image:init '(:png))
-    (let ((texture (load-texture-from-file renderer "15/arrow.png"))
+    (let ((texture (load-texture-from-file renderer (asset-pathname "assets/15/arrow.png")))
           (flip :none)
           (degrees 0)
           (delta 60))
diff --git a/15/arrow.png b/assets/15/arrow.png
similarity index 100%
rename from 15/arrow.png
rename to assets/15/arrow.png
diff --git a/sdl2-tutorial.asd b/sdl2-tutorial.asd
index 70f1883..baea08f 100644
--- a/sdl2-tutorial.asd
+++ b/sdl2-tutorial.asd
@@ -19,7 +19,7 @@
                (:file "12-color-modulation")
                (:file "13-alpha-blending")
                (:file "14-animated-sprites-and-vsync")
-               (:file "15/tutorial-15")
+               (:file "15-rotation-and-flipping")
                (:file "16/tutorial-16"))
   :in-order-to ((test-op (test-op "sdl2-tutorial/tests"))))