dan/biscuit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repaint on orientation changes, rotate road names

Browse Source 
this is still not correct, but it's closer
This commit is contained in:
Daniel Barlow 2025-06-10 13:12:19 +01:00
parent 4aa140c264
commit 7543e775e5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/maps/main.fnl
View File

@ -66,7 +66,7 @@ label.readout {
:lon 0 :lon 0
:zoom 17 :zoom 17
:course 0 ; direction of travel :course 0 ; direction of travel
:orientation 0 ; map rotation angle from north :orientation {:target 0 :actual 0} ; map rotation angle from north
:tiles {} :tiles {}
} }
) )
@ -186,8 +186,10 @@ label.readout {
(set biggest-n (- i 1))))) (set biggest-n (- i 1)))))
(let [[x y] (. points biggest-n) (let [[x y] (. points biggest-n)
[nx ny] (. points (+ 1 biggest-n)) [nx ny] (. points (+ 1 biggest-n))
angle (math.atan (- ny y) (- nx x))] angle (math.atan (- ny y) (- nx x))
(if (> nx x) screen-angle (- angle
(/ (* app-state.orientation.target math.pi) 180))]
(if (< (math.abs screen-angle) (/ math.pi 2))
(values (values
(* tile-size (- x bounds.min.x)) (* tile-size (- x bounds.min.x))
(* tile-size (- y bounds.min.y)) (* tile-size (- y bounds.min.y))
@ -271,7 +273,7 @@ label.readout {
(draw-onto-map-surface bounds app-state.zoom))))) (draw-onto-map-surface bounds app-state.zoom)))))
(g:translate (+ (/ viewport-width 2)) (+ (/ viewport-height 2))) (g:translate (+ (/ viewport-width 2)) (+ (/ viewport-height 2)))
(g:rotate (* (/ (- 360 app-state.orientation) 180) math.pi)) (g:rotate (* (/ (- 360 app-state.orientation.actual) 180) math.pi))
(g:translate (- (/ viewport-width 2)) (- (/ viewport-height 2))) (g:translate (- (/ viewport-width 2)) (- (/ viewport-height 2)))
(g:set_source_surface map-surface (- offset-x) (- offset-y)) (g:set_source_surface map-surface (- offset-x) (- offset-y))
@ -322,9 +324,15 @@ label.readout {
(when (not (bounds= old-bounds bounds)) (when (not (bounds= old-bounds bounds))
(fetch-tiles bounds app-state.tiles app-state.zoom) (fetch-tiles bounds app-state.tiles app-state.zoom)
(set map-surface nil))) (set map-surface nil)))
(set app-state.orientation (when (> (math.abs (- app-state.orientation.target app-state.course)) 20)
(+ app-state.orientation (set app-state.orientation.target app-state.course)
(* 0.05 (- app-state.course app-state.orientation)))) (set map-surface nil))
(when (not (= app-state.orientation.target app-state.orientation.actual))
(set app-state.orientation.actual
(+ app-state.orientation.actual
(* 0.05 (- app-state.orientation.target app-state.orientation.actual)))))
(each [name widget (pairs state-widgets)] (each [name widget (pairs state-widgets)]
(case name (case name
:speed (widget:set_label :speed (widget:set_label
@ -359,7 +367,7 @@ label.readout {
(fn [self g] (fn [self g]
(g:set_source_rgb 0.4 0.0 0.1) (g:set_source_rgb 0.4 0.0 0.1)
(g:translate (// height 2) (// height 2)) (g:translate (// height 2) (// height 2))
(g:rotate (* (/ (- app-state.course app-state.orientation) (g:rotate (* (/ (- app-state.course app-state.orientation.actual)
180) math.pi)) 180) math.pi))
(g:translate (// height -2) (// height -2)) (g:translate (// height -2) (// height -2))
(g:set_line_width 4) (g:set_line_width 4)