Use flat file hierarchy

TatriX · Jul 16, 2021 · 1cbd6d6 · 1cbd6d6
1 parent 1cec5d8
commit 1cbd6d6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/01/tutorial-01.lisp → 01-hello-sdl.lisp b/01/tutorial-01.lisp → 01-hello-sdl.lisp
@@ -1,8 +1,8 @@
-(defpackage #:sdl2-tutorial-01
+(defpackage #:sdl2-tutorial-01-hello-sdl
   (:use :cl)
   (:export :run))
 
-(in-package :sdl2-tutorial-01)
+(in-package :sdl2-tutorial-01-hello-sdl)
 
 (defparameter *screen-width* 640)
 (defparameter *screen-height* 480)

diff --git a/02/tutorial-02.lisp → 02-getting-an-image-on-the-screen.lisp b/02/tutorial-02.lisp → 02-getting-an-image-on-the-screen.lisp
@@ -1,16 +1,16 @@
-(defpackage #:sdl2-tutorial-02
+(defpackage #:sdl2-tutorial-02-getting-an-image-on-the-screen
   (:use :cl)
   (:export :run))
 
-(in-package :sdl2-tutorial-02)
+(in-package :sdl2-tutorial-02-getting-an-image-on-the-screen)
 
 (defparameter *screen-width* 640)
 (defparameter *screen-height* 480)
 
 (defmacro with-window-surface ((window surface) &body body)
   `(sdl2:with-init (:video)
      (sdl2:with-window (,window
-                        :title "SDL2 Tutorial"
+                        :title "SDL2 Tutorial 02"
                         :w *screen-width*
                         :h *screen-height*
                         :flags '(:shown))
@@ -26,7 +26,7 @@
 
 (defun run()
   (with-window-surface (window screen-surface)
-    (let ((image (load-image #p"./02/hello_world.bmp")))
+    (let ((image (load-image #p"./assets/02/hello_world.bmp")))
       (sdl2:blit-surface image nil screen-surface nil)
       (sdl2:update-window window)
       (sdl2:delay 2000)

diff --git a/03/tutorial-03.lisp → 03-event-driven-programming.lisp b/03/tutorial-03.lisp → 03-event-driven-programming.lisp
@@ -1,16 +1,16 @@
-(defpackage #:sdl2-tutorial-03
+(defpackage #:sdl2-tutorial-03-event-driven-programming
   (:use :common-lisp)
   (:export :main))
 
-(in-package :sdl2-tutorial-03)
+(in-package :sdl2-tutorial-03-event-driven-programming)
 
 (defparameter *screen-width* 640)
 (defparameter *screen-height* 480)
 
 (defmacro with-window-surface ((window surface) &body body)
   `(sdl2:with-init (:video)
      (sdl2:with-window (,window
-                        :title "SDL2 Tutorial"
+                        :title "SDL2 Tutorial 03"
                         :w *screen-width*
                         :h *screen-height*
                         :flags '(:shown))
@@ -26,7 +26,7 @@
 
 (defun run ()
   (with-window-surface (window screen-surface)
-    (let ((image (load-image "./03/exit.bmp")))
+    (let ((image (load-image "./assets/03/exit.bmp")))
       (sdl2:with-event-loop (:method :poll)
         (:quit () t)
         (:idle ()

diff --git a/02/hello_world.bmp → assets/02/hello_world.bmp b/02/hello_world.bmp → assets/02/hello_world.bmp
diff --git a/03/exit.bmp → assets/03/exit.bmp b/03/exit.bmp → assets/03/exit.bmp
diff --git a/sdl2-tutorial.asd b/sdl2-tutorial.asd
@@ -3,9 +3,9 @@
   :version "0.0.1"
   :licence "Public Domain"
   :depends-on ("bordeaux-threads" "sdl2" "sdl2-image" "sdl2-ttf")
-  :components ((:file "01/tutorial-01")
-               (:file "02/tutorial-02")
-               (:file "03/tutorial-03")
+  :components ((:file "01-hello-sdl")
+               (:file "02-getting-an-image-on-the-screen")
+               (:file "03-event-driven-programming")
                (:file "04/tutorial-04")
                (:file "05/tutorial-05")
                (:file "06/tutorial-06")