some cleanup

This commit is contained in:
Nico 2022-03-31 16:47:03 +01:00
parent 672bfa1232
commit 8fd5dd41b0
1 changed files with 4 additions and 6 deletions

View File

@ -21,8 +21,7 @@
; image representing the empty grid ; image representing the empty grid
(define EMPTY-GRID (define EMPTY-GRID
(let* [ (let* [[bitmap (make-bitmap (* GRID-WIDTH GRID-SCALE) (* GRID-HEIGHT GRID-SCALE))]
[bitmap (make-bitmap (* GRID-WIDTH GRID-SCALE) (* GRID-HEIGHT GRID-SCALE))]
[dc (new bitmap-dc% [bitmap bitmap])]] [dc (new bitmap-dc% [bitmap bitmap])]]
(send dc set-brush "black" 'solid) (send dc set-brush "black" 'solid)
(for ([x (in-range GRID-WIDTH)]) (for ([x (in-range GRID-WIDTH)])
@ -64,7 +63,7 @@
(< (- GRID-WIDTH 1) (point-x p)) (< (- GRID-WIDTH 1) (point-x p))
(< (- GRID-WIDTH 1) (point-y p)))) (< (- GRID-WIDTH 1) (point-y p))))
; Line Board -> Bool ; Line Grid -> Bool
; returns #t if adding the given move to the grid is valid. ; returns #t if adding the given move to the grid is valid.
(define (valid-move? line grid) (define (valid-move? line grid)
(and (and
@ -78,8 +77,7 @@
; Grid -> Image ; Grid -> Image
; renders grid to an image for showing humans the game. ; renders grid to an image for showing humans the game.
(define (render-grid grid) (define (render-grid grid)
(let* [ (let* [[bitmap (make-bitmap (* GRID-WIDTH GRID-SCALE) (* GRID-HEIGHT GRID-SCALE))]
[bitmap (make-bitmap (* GRID-WIDTH GRID-SCALE) (* GRID-HEIGHT GRID-SCALE))]
[dc (new bitmap-dc% [bitmap bitmap])]] [dc (new bitmap-dc% [bitmap bitmap])]]
(for ([l grid]) (for ([l grid])
(cond (cond
@ -89,7 +87,7 @@
(+ 4 (* GRID-SCALE (point-x (line-from l)))) (+ 4 (* GRID-SCALE (point-x (line-from l))))
(+ 4 (* GRID-SCALE (point-y (line-from l)))) (+ 4 (* GRID-SCALE (point-y (line-from l))))
(+ 4 (* GRID-SCALE (point-x (line-to l)))) (+ 4 (* GRID-SCALE (point-x (line-to l))))
(+ 4 (* GRID-SCALE (point-y (line-to l)))))) (+ 4 (* GRID-SCALE (point-y (line-to l)))))) ; draw the line
(send dc draw-bitmap EMPTY-GRID 0 0) ; overlay dot grid (send dc draw-bitmap EMPTY-GRID 0 0) ; overlay dot grid
bitmap)) bitmap))