Refactor tutorial 12

TatriX · Sep 19, 2021 · 8041d52 · 8041d52
1 parent 401c62d
commit 8041d52
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/12/tutorial-12.lisp → 12-color-modulation.lisp b/12/tutorial-12.lisp → 12-color-modulation.lisp
@@ -1,8 +1,9 @@
-(defpackage #:sdl2-tutorial-12
-  (:use :common-lisp)
-  (:export :main))
+(defpackage #:sdl2-tutorial-12-color-modulation
+  (:use :cl)
+  (:export :run)
+  (:import-from :sdl2-tutorial-utils :asset-pathname))
 
-(in-package :sdl2-tutorial-12)
+(in-package #:sdl2-tutorial-12-color-modulation)
 
 (defparameter *screen-width* 640)
 (defparameter *screen-height* 480)
@@ -48,7 +49,7 @@
 (defmacro with-window-renderer ((window renderer) &body body)
   `(sdl2:with-init (:video)
      (sdl2:with-window (,window
-                        :title "SDL2 Tutorial"
+                        :title "SDL2 Tutorial 12"
                         :w *screen-width*
                         :h *screen-height*
                         :flags '(:shown))
@@ -64,10 +65,10 @@
 (defmacro clamp-decf (x delta)
   `(setf ,x (clamp (- ,x ,delta))))
 
-(defun main()
+(defun run ()
   (with-window-renderer (window renderer)
     (sdl2-image:init '(:png))
-    (let ((texture (load-texture-from-file renderer "12/texture.png"))
+    (let ((texture (load-texture-from-file renderer (asset-pathname #P"assets/12/texture.png")))
           (r 255)
           (g 255)
           (b 255)

diff --git a/12/texture.png → assets/12/texture.png b/12/texture.png → assets/12/texture.png
diff --git a/sdl2-tutorial.asd b/sdl2-tutorial.asd
@@ -16,7 +16,7 @@
                (:file "09-the-viewport")
                (:file "10-color-keying")
                (:file "11-clip-rendering-and-sprite-sheets")
-               (:file "12/tutorial-12")
+               (:file "12-color-modulation")
                (:file "13/tutorial-13")
                (:file "14/tutorial-14")
                (:file "15/tutorial-15")