Skip to content

Commit

Permalink
Refactor tutorial 08
Browse files Browse the repository at this point in the history
  • Loading branch information
TatriX committed Jul 29, 2021
1 parent 8efaa28 commit 2808a89
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 53 deletions.
60 changes: 60 additions & 0 deletions 08-geometry-rendering.lisp
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
(defpackage #:sdl2-tutorial-08-geometry-rendering
(:use :cl)
(:export :run))

(in-package :sdl2-tutorial-08-geometry-rendering)

(defparameter *screen-width* 640)
(defparameter *screen-height* 480)

(defmacro with-window-renderer ((window renderer) &body body)
`(sdl2:with-init (:video)
(sdl2:with-window (,window
:title "SDL2 Tutorial 08"
:w *screen-width*
:h *screen-height*
:flags '(:shown))
(sdl2:with-renderer (,renderer ,window :index -1 :flags '(:accelerated))
,@body))))

(defun run ()
(with-window-renderer (window renderer)
(sdl2-image:init '(:png))
(sdl2:with-event-loop (:method :poll)
(:quit () t)
(:idle ()
;; Clear screen
(sdl2:set-render-draw-color renderer #xFF #xFF #xFF #xFF)
(sdl2:render-clear renderer)

;; Render red filled quad
(sdl2:with-rects ((fill-rect (/ *screen-width* 4)
(/ *screen-height* 4)
(/ *screen-width* 2)
(/ *screen-height* 2)))
(sdl2:set-render-draw-color renderer #xFF #x00 #x00 #xFF)
(sdl2:render-fill-rect renderer fill-rect))

;; Render green outlined quad
(sdl2:with-rects ((outline-rect (round (/ *screen-width* 6))
(round (/ *screen-height* 8))
(round (* 2/3 *screen-width*))
(round (* 2/3 *screen-height*))))
(sdl2:set-render-draw-color renderer #x00 #xFF #x00 #xFF)
(sdl2:render-draw-rect renderer outline-rect))

;; Draw blue horizontal line
(sdl2:set-render-draw-color renderer #x00 #x00 #xFF #xFF)
(sdl2:render-draw-line renderer
0
(/ *screen-height* 2)
*screen-width*
(/ *screen-height* 2))

;; Draw vertical line of yellow dots
(sdl2:set-render-draw-color renderer #xFF #xFF #x00 #xFF)
(loop for i from 0 below *screen-height* by 4
do (sdl2::render-draw-point renderer (/ *screen-width* 2) i))

;; Update screen
(sdl2:render-present renderer)))))
52 changes: 0 additions & 52 deletions 08/tutorial-08.lisp

This file was deleted.

2 changes: 1 addition & 1 deletion sdl2-tutorial.asd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
(:file "05-optimized-surface-loading-and-soft-stretching")
(:file "06-extension-libraries-and-loading-other-image-formats.lisp")
(:file "07-texture-loading-and-rendering.lisp")
(:file "08/tutorial-08")
(:file "08-geometry-rendering")
(:file "09/tutorial-09")
(:file "10/tutorial-10")
(:file "11/tutorial-11")
Expand Down

0 comments on commit 2808a89

Please sign in to comment.