diff --git a/LICENSE.txt b/LICENSE.txt index aabb04a..b6d6ad3 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -warp +Warp Copyright (c) David Vanderson This code is available according to same terms as Racket: diff --git a/client.rkt b/client.rkt index e2b70c1..17a38c1 100644 --- a/client.rkt +++ b/client.rkt @@ -549,17 +549,29 @@ (define zcx (- (right) 16 (/ zw 2))) (define zcy (+ (top) 60 (/ zh 2))) (prepend! sprites (sprite zcx (+ zcy (- (/ zh 2))) (sprite-idx csd '20x2) - #:layer LAYER_UI #:b (send mapcol blue))) + #:layer LAYER_UI + #:r (send zoomcol red) + #:g (send zoomcol green) + #:b (send zoomcol blue))) (prepend! sprites (sprite zcx (+ zcy (/ zh 2)) (sprite-idx csd '20x2) - #:layer LAYER_UI #:b (send mapcol blue))) + #:layer LAYER_UI + #:r (send zoomcol red) + #:g (send zoomcol green) + #:b (send zoomcol blue))) (prepend! sprites (sprite zcx zcy (sprite-idx csd '2x150) - #:layer LAYER_UI #:b (send mapcol blue))) + #:layer LAYER_UI + #:r (send zoomcol red) + #:g (send zoomcol green) + #:b (send zoomcol blue))) (define zfrac (/ (- (log scale-play) (log (min-scale))) (- (log (max-scale)) (log (min-scale))))) (prepend! sprites (sprite zcx (+ zcy (/ zh 2) (- (* zfrac zh))) (sprite-idx csd '20x2) - #:layer LAYER_UI #:b (send mapcol blue))) + #:layer LAYER_UI + #:r (send zoomcol red) + #:g (send zoomcol green) + #:b (send zoomcol blue))) (define zbutton (button 'hidden 'zoom #f zcx zcy zw zh "Zoom" (lambda (x y) (define zfracy (/ (+ (/ zh 2) (- y)) zh)) diff --git a/draw-utils.rkt b/draw-utils.rkt index 5a131c1..e6fdc89 100644 --- a/draw-utils.rkt +++ b/draw-utils.rkt @@ -13,7 +13,8 @@ (provide (all-defined-out)) -(define mapcol (make-color 0 0 200 1.0)) ; sector lines, zoom scale +(define mapcol (make-color 0 0 200 1.0)) ; sector lines +(define zoomcol (make-color 130 50 10 1.0)) ; zoom meter (define canon-width 800.0) (define canon-height 600.0)